aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Moench-Tegeder <cmt@FreeBSD.org>2023-10-17 10:32:12 +0000
committerChristoph Moench-Tegeder <cmt@FreeBSD.org>2023-10-17 10:32:12 +0000
commit64a6c939ed296f374df8492a6d3d2633154b7b14 (patch)
tree885c667ed9d3934ce13235008fbdc1ce68fb97fb
parent9614ad769229902bd03698979c5fdc0436d154c3 (diff)
downloadports-64a6c939ed296f374df8492a6d3d2633154b7b14.tar.gz
ports-64a6c939ed296f374df8492a6d3d2633154b7b14.zip
www/firefox: update to 119.0 (rc1)
Release Notes (soon): https://www.mozilla.org/en-US/firefox/119.0/releasenotes/
Diffstat
-rw-r--r--Mk/bsd.gecko.mk2
-rw-r--r--www/firefox/Makefile8
-rw-r--r--www/firefox/distinfo6
-rw-r--r--www/firefox/files/patch-libwebrtc-generated2484
4 files changed, 1469 insertions, 1031 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 98eb1ed72709..b994ba61fce3 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -74,7 +74,7 @@ BINARY_ALIAS+= python3=${PYTHON_CMD}
BUNDLE_LIBS= yes
BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \
- rust-cbindgen>=0.24.3:devel/rust-cbindgen \
+ rust-cbindgen>=0.26.0:devel/rust-cbindgen \
${RUST_DEFAULT}>=1.72.0:lang/${RUST_DEFAULT} \
node:www/node
LIB_DEPENDS+= libdrm.so:graphics/libdrm
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 06d9fbab6bf1..79ce284cf7bd 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,9 +1,9 @@
PORTNAME= firefox
-DISTVERSION= 118.0.2
+DISTVERSION= 119.0
PORTEPOCH= 2
CATEGORIES= www wayland
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \
- MOZILLA/${PORTNAME}/candidates/${DISTVERSION}${DISTVERSIONSUFFIX}-candidates/build2/source
+ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}${DISTVERSIONSUFFIX}-candidates/build1/source
DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX}
MAINTAINER= gecko@FreeBSD.org
@@ -11,10 +11,10 @@ COMMENT= Web browser based on the browser portion of Mozilla
WWW= https://www.mozilla.com/firefox
BUILD_DEPENDS= nspr>=4.32:devel/nspr \
- nss>=3.93:security/nss \
+ nss>=3.94:security/nss \
icu>=73.1:devel/icu \
libevent>=2.1.8:devel/libevent \
- harfbuzz>=8.0.1:print/harfbuzz \
+ harfbuzz>=8.2.1:print/harfbuzz \
graphite2>=1.3.14:graphics/graphite2 \
png>=1.6.39:graphics/png \
dav1d>=1.0.0:multimedia/dav1d \
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 3669d9e833fa..8a4da9c201f1 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1696885278
-SHA256 (firefox-118.0.2.source.tar.xz) = 89626520f2f0f782f37c074b94690e0f08dcf416be2b992f4aad68df5d727b21
-SIZE (firefox-118.0.2.source.tar.xz) = 520864692
+TIMESTAMP = 1697527283
+SHA256 (firefox-119.0.source.tar.xz) = 6c84c48171da7edbec3f30b637814feb179ae85c3f7f29ba9c00dacbda517d6a
+SIZE (firefox-119.0.source.tar.xz) = 521569780
diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated
index 933db150f486..065a36e2db1f 100644
--- a/www/firefox/files/patch-libwebrtc-generated
+++ b/www/firefox/files/patch-libwebrtc-generated
@@ -1,10 +1,10 @@
-commit 8a1cb79aa0534bfcac637a960b66a1b2689cba76
+commit fdfe9894a5854967e2c8ffb6759ca2e59b9fe6c6
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
- regenerate FreeBSD libwebrtc patch for Firefox 118
+ regenerate FreeBSD libwebrtc patch for Firefox 119
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 aa958f70420c..e6a2d969a1fd 100644
+index cf60c534b8df..e6a2d969a1fd 100644
--- third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
+++ third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -28,7 +28,7 @@ index aa958f70420c..e6a2d969a1fd 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -93,6 +93,7 @@ index aa958f70420c..e6a2d969a1fd 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -215,7 +216,7 @@ index aa958f70420c..e6a2d969a1fd 100644
Library("resource_adaptation_api_gn")
diff --git third_party/libwebrtc/api/array_view_gn/moz.build third_party/libwebrtc/api/array_view_gn/moz.build
-index e453cb8585d0..552c7e77985a 100644
+index d8f3d9bc8f6f..552c7e77985a 100644
--- third_party/libwebrtc/api/array_view_gn/moz.build
+++ third_party/libwebrtc/api/array_view_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -239,7 +240,7 @@ index e453cb8585d0..552c7e77985a 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -304,6 +305,7 @@ index e453cb8585d0..552c7e77985a 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -348,7 +350,7 @@ index e453cb8585d0..552c7e77985a 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -408,7 +410,7 @@ index e453cb8585d0..552c7e77985a 100644
-
Library("array_view_gn")
diff --git third_party/libwebrtc/api/audio/aec3_config_gn/moz.build third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
-index c2d256488d9b..1b3eb3a6acb6 100644
+index d79aa2f0200c..1b3eb3a6acb6 100644
--- third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
+++ third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -432,7 +434,7 @@ index c2d256488d9b..1b3eb3a6acb6 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -497,6 +499,7 @@ index c2d256488d9b..1b3eb3a6acb6 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -619,7 +622,7 @@ index c2d256488d9b..1b3eb3a6acb6 100644
Library("aec3_config_gn")
diff --git third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
-index 9a644d357f67..f9c2d536b5d3 100644
+index 2c211f384b72..f9c2d536b5d3 100644
--- third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
@@ -12,12 +12,21 @@ AllowCompilerWarnings()
@@ -644,7 +647,7 @@ index 9a644d357f67..f9c2d536b5d3 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -713,6 +716,7 @@ index 9a644d357f67..f9c2d536b5d3 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -842,7 +846,7 @@ index 9a644d357f67..f9c2d536b5d3 100644
Library("aec3_factory_gn")
diff --git third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
-index 6fac266c7368..ce2f85ba66dc 100644
+index 9248b91c2d92..ce2f85ba66dc 100644
--- third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -866,7 +870,7 @@ index 6fac266c7368..ce2f85ba66dc 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,184 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -931,6 +935,7 @@ index 6fac266c7368..ce2f85ba66dc 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -1057,7 +1062,7 @@ index 6fac266c7368..ce2f85ba66dc 100644
Library("audio_frame_api_gn")
diff --git third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
-index 1732aa7d0c9a..a6098a248028 100644
+index cb3495a89e19..a6098a248028 100644
--- third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -1081,7 +1086,7 @@ index 1732aa7d0c9a..a6098a248028 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1142,6 +1147,7 @@ index 1732aa7d0c9a..a6098a248028 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -1186,7 +1192,7 @@ index 1732aa7d0c9a..a6098a248028 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -1246,7 +1252,7 @@ index 1732aa7d0c9a..a6098a248028 100644
-
Library("audio_frame_processor_gn")
diff --git third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
-index 4eac2aa4b4f4..2df8ddd20ca2 100644
+index 0ef13b0f4588..2df8ddd20ca2 100644
--- third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -1270,7 +1276,7 @@ index 4eac2aa4b4f4..2df8ddd20ca2 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1335,6 +1341,7 @@ index 4eac2aa4b4f4..2df8ddd20ca2 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -1383,7 +1390,7 @@ index 4eac2aa4b4f4..2df8ddd20ca2 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -154,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -1443,7 +1450,7 @@ index 4eac2aa4b4f4..2df8ddd20ca2 100644
-
Library("audio_mixer_api_gn")
diff --git third_party/libwebrtc/api/audio/echo_control_gn/moz.build third_party/libwebrtc/api/audio/echo_control_gn/moz.build
-index 2e128f80386d..6e4054510c88 100644
+index 81070090281f..6e4054510c88 100644
--- third_party/libwebrtc/api/audio/echo_control_gn/moz.build
+++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -1467,7 +1474,7 @@ index 2e128f80386d..6e4054510c88 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1532,6 +1539,7 @@ index 2e128f80386d..6e4054510c88 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -1576,7 +1584,7 @@ index 2e128f80386d..6e4054510c88 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -1636,7 +1644,7 @@ index 2e128f80386d..6e4054510c88 100644
-
Library("echo_control_gn")
diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
-index 87335c298d63..9f1caaa8645d 100644
+index ff00330a684c..9f1caaa8645d 100644
--- third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -1660,7 +1668,7 @@ index 87335c298d63..9f1caaa8645d 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1725,6 +1733,7 @@ index 87335c298d63..9f1caaa8645d 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -1851,7 +1860,7 @@ index 87335c298d63..9f1caaa8645d 100644
Library("audio_decoder_L16_gn")
diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
-index 49e0d546f1ce..57de72563f2e 100644
+index ee8f51ccb440..57de72563f2e 100644
--- third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -1875,7 +1884,7 @@ index 49e0d546f1ce..57de72563f2e 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1940,6 +1949,7 @@ index 49e0d546f1ce..57de72563f2e 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -2066,7 +2076,7 @@ index 49e0d546f1ce..57de72563f2e 100644
Library("audio_encoder_L16_gn")
diff --git third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
-index 846946073ee1..0a34d8fdda8a 100644
+index e9984fe360ce..0a34d8fdda8a 100644
--- third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -2090,7 +2100,7 @@ index 846946073ee1..0a34d8fdda8a 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,183 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,184 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2155,6 +2165,7 @@ index 846946073ee1..0a34d8fdda8a 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -2281,7 +2292,7 @@ index 846946073ee1..0a34d8fdda8a 100644
Library("audio_codecs_api_gn")
diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
-index 366307ea13d7..7ea300e23f2a 100644
+index c0f6570d24b9..7ea300e23f2a 100644
--- third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
@@ -12,13 +12,22 @@ AllowCompilerWarnings()
@@ -2307,7 +2318,7 @@ index 366307ea13d7..7ea300e23f2a 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2376,6 +2387,7 @@ index 366307ea13d7..7ea300e23f2a 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -2505,7 +2517,7 @@ index 366307ea13d7..7ea300e23f2a 100644
Library("builtin_audio_decoder_factory_gn")
diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
-index db0e3fbe00d5..0818f76d7b90 100644
+index bb012a151a7c..0818f76d7b90 100644
--- third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
@@ -12,13 +12,22 @@ AllowCompilerWarnings()
@@ -2531,7 +2543,7 @@ index db0e3fbe00d5..0818f76d7b90 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2600,6 +2612,7 @@ index db0e3fbe00d5..0818f76d7b90 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -2729,7 +2742,7 @@ index db0e3fbe00d5..0818f76d7b90 100644
Library("builtin_audio_encoder_factory_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
-index 4782d01dd10f..588ec3b5b33b 100644
+index 2a3e692b812d..588ec3b5b33b 100644
--- third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -2753,7 +2766,7 @@ index 4782d01dd10f..588ec3b5b33b 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2818,6 +2831,7 @@ index 4782d01dd10f..588ec3b5b33b 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -2944,7 +2958,7 @@ index 4782d01dd10f..588ec3b5b33b 100644
Library("audio_decoder_g711_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
-index c972978c13ef..20d76c5496fa 100644
+index 7f89c91164f6..20d76c5496fa 100644
--- third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -2968,7 +2982,7 @@ index c972978c13ef..20d76c5496fa 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3033,6 +3047,7 @@ index c972978c13ef..20d76c5496fa 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -3159,7 +3174,7 @@ index c972978c13ef..20d76c5496fa 100644
Library("audio_encoder_g711_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
-index 77003c77a9dd..f738a9569a45 100644
+index 9dd0927ed536..f738a9569a45 100644
--- third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -3183,7 +3198,7 @@ index 77003c77a9dd..f738a9569a45 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3248,6 +3263,7 @@ index 77003c77a9dd..f738a9569a45 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -3374,7 +3390,7 @@ index 77003c77a9dd..f738a9569a45 100644
Library("audio_decoder_g722_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
-index 41e1e248c525..2cc917d90aab 100644
+index 4ecf66bd1968..2cc917d90aab 100644
--- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -3398,7 +3414,7 @@ index 41e1e248c525..2cc917d90aab 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3463,6 +3479,7 @@ index 41e1e248c525..2cc917d90aab 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -3511,7 +3528,7 @@ index 41e1e248c525..2cc917d90aab 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -154,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -3571,7 +3588,7 @@ index 41e1e248c525..2cc917d90aab 100644
-
Library("audio_encoder_g722_config_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
-index c3beba6cdb78..8f13941e25c3 100644
+index 36bd517e0079..8f13941e25c3 100644
--- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -3595,7 +3612,7 @@ index c3beba6cdb78..8f13941e25c3 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3660,6 +3677,7 @@ index c3beba6cdb78..8f13941e25c3 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -3786,7 +3804,7 @@ index c3beba6cdb78..8f13941e25c3 100644
Library("audio_encoder_g722_gn")
diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
-index 53e9d1a4a7ef..ada577bf55ee 100644
+index f02bb1035f05..ada577bf55ee 100644
--- third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -3810,7 +3828,7 @@ index 53e9d1a4a7ef..ada577bf55ee 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3879,6 +3897,7 @@ index 53e9d1a4a7ef..ada577bf55ee 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -4008,7 +4027,7 @@ index 53e9d1a4a7ef..ada577bf55ee 100644
Library("audio_decoder_ilbc_gn")
diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
-index 75737b8f19b0..008599051c34 100644
+index 28a357256253..008599051c34 100644
--- third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -4032,7 +4051,7 @@ index 75737b8f19b0..008599051c34 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4093,6 +4112,7 @@ index 75737b8f19b0..008599051c34 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -4137,7 +4157,7 @@ index 75737b8f19b0..008599051c34 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -4197,7 +4217,7 @@ index 75737b8f19b0..008599051c34 100644
-
Library("audio_encoder_ilbc_config_gn")
diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
-index bddfe4219301..5d2f4376ee92 100644
+index 97953a5df078..5d2f4376ee92 100644
--- third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -4221,7 +4241,7 @@ index bddfe4219301..5d2f4376ee92 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4290,6 +4310,7 @@ index bddfe4219301..5d2f4376ee92 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -4419,7 +4440,7 @@ index bddfe4219301..5d2f4376ee92 100644
Library("audio_encoder_ilbc_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
-index 2b2bc6d9a7b7..fce4fdca7298 100644
+index 21c64c783062..fce4fdca7298 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -4443,7 +4464,7 @@ index 2b2bc6d9a7b7..fce4fdca7298 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,184 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4508,6 +4529,7 @@ index 2b2bc6d9a7b7..fce4fdca7298 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -4634,7 +4656,7 @@ index 2b2bc6d9a7b7..fce4fdca7298 100644
Library("audio_decoder_multiopus_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
-index e2c470d5ee58..0c7b461dd94a 100644
+index 9b1098290596..0c7b461dd94a 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -4658,7 +4680,7 @@ index e2c470d5ee58..0c7b461dd94a 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4723,6 +4745,7 @@ index e2c470d5ee58..0c7b461dd94a 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -4771,7 +4794,7 @@ index e2c470d5ee58..0c7b461dd94a 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -154,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -4831,7 +4854,7 @@ index e2c470d5ee58..0c7b461dd94a 100644
-
Library("audio_decoder_opus_config_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
-index 58e6355a5568..c40633ff9ee4 100644
+index 24625fb77d03..c40633ff9ee4 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -4855,7 +4878,7 @@ index 58e6355a5568..c40633ff9ee4 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4924,6 +4947,7 @@ index 58e6355a5568..c40633ff9ee4 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -5053,7 +5077,7 @@ index 58e6355a5568..c40633ff9ee4 100644
Library("audio_decoder_opus_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
-index 91afd0a4e40a..27167f6f4829 100644
+index 2c2a46ea430d..27167f6f4829 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -5077,7 +5101,7 @@ index 91afd0a4e40a..27167f6f4829 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,184 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5142,6 +5166,7 @@ index 91afd0a4e40a..27167f6f4829 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -5268,7 +5293,7 @@ index 91afd0a4e40a..27167f6f4829 100644
Library("audio_encoder_multiopus_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
-index 06732b48f469..0ccb94d1f9fb 100644
+index 5346ca5b1a16..0ccb94d1f9fb 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
@@ -12,12 +12,21 @@ AllowCompilerWarnings()
@@ -5293,7 +5318,7 @@ index 06732b48f469..0ccb94d1f9fb 100644
FINAL_LIBRARY = "webrtc"
-@@ -48,175 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,176 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5354,6 +5379,7 @@ index 06732b48f469..0ccb94d1f9fb 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -5476,7 +5502,7 @@ index 06732b48f469..0ccb94d1f9fb 100644
Library("audio_encoder_opus_config_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
-index ab84d3f7559f..e4bcd225837a 100644
+index 09647c7b4de8..e4bcd225837a 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -5500,7 +5526,7 @@ index ab84d3f7559f..e4bcd225837a 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5569,6 +5595,7 @@ index ab84d3f7559f..e4bcd225837a 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -5698,7 +5725,7 @@ index ab84d3f7559f..e4bcd225837a 100644
Library("audio_encoder_opus_gn")
diff --git third_party/libwebrtc/api/audio_options_api_gn/moz.build third_party/libwebrtc/api/audio_options_api_gn/moz.build
-index 1b19c42e986c..8d416085b79b 100644
+index 9e2bb7030b2b..8d416085b79b 100644
--- third_party/libwebrtc/api/audio_options_api_gn/moz.build
+++ third_party/libwebrtc/api/audio_options_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -5722,7 +5749,7 @@ index 1b19c42e986c..8d416085b79b 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5787,6 +5814,7 @@ index 1b19c42e986c..8d416085b79b 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -5909,7 +5937,7 @@ index 1b19c42e986c..8d416085b79b 100644
Library("audio_options_api_gn")
diff --git third_party/libwebrtc/api/bitrate_allocation_gn/moz.build third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
-index a694eff03b3f..953d60cc35a0 100644
+index 28e30f3e79d7..953d60cc35a0 100644
--- third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
+++ third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -5933,7 +5961,7 @@ index a694eff03b3f..953d60cc35a0 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5998,6 +6026,7 @@ index a694eff03b3f..953d60cc35a0 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -6042,7 +6071,7 @@ index a694eff03b3f..953d60cc35a0 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -6102,7 +6131,7 @@ index a694eff03b3f..953d60cc35a0 100644
-
Library("bitrate_allocation_gn")
diff --git third_party/libwebrtc/api/call_api_gn/moz.build third_party/libwebrtc/api/call_api_gn/moz.build
-index e446d8228025..8b21859a8adb 100644
+index 2094b105a2db..8b21859a8adb 100644
--- third_party/libwebrtc/api/call_api_gn/moz.build
+++ third_party/libwebrtc/api/call_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -6126,7 +6155,7 @@ index e446d8228025..8b21859a8adb 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6187,6 +6216,7 @@ index e446d8228025..8b21859a8adb 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -6231,7 +6261,7 @@ index e446d8228025..8b21859a8adb 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -6291,7 +6321,7 @@ index e446d8228025..8b21859a8adb 100644
-
Library("call_api_gn")
diff --git third_party/libwebrtc/api/callfactory_api_gn/moz.build third_party/libwebrtc/api/callfactory_api_gn/moz.build
-index b0f2bbbf3545..e51b0bd98f1a 100644
+index f676975bfa32..e51b0bd98f1a 100644
--- third_party/libwebrtc/api/callfactory_api_gn/moz.build
+++ third_party/libwebrtc/api/callfactory_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -6315,7 +6345,7 @@ index b0f2bbbf3545..e51b0bd98f1a 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6384,6 +6414,7 @@ index b0f2bbbf3545..e51b0bd98f1a 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -6435,7 +6466,7 @@ index b0f2bbbf3545..e51b0bd98f1a 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -161,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -6495,7 +6526,7 @@ index b0f2bbbf3545..e51b0bd98f1a 100644
-
Library("callfactory_api_gn")
diff --git third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
-index 1ce4cdd00a59..16ee32317d2a 100644
+index 1c1515cdae84..16ee32317d2a 100644
--- third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
+++ third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -6519,7 +6550,7 @@ index 1ce4cdd00a59..16ee32317d2a 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6584,6 +6615,7 @@ index 1ce4cdd00a59..16ee32317d2a 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -6628,7 +6660,7 @@ index 1ce4cdd00a59..16ee32317d2a 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -6688,7 +6720,7 @@ index 1ce4cdd00a59..16ee32317d2a 100644
-
Library("frame_decryptor_interface_gn")
diff --git third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
-index b8385d1daacd..0ee97ec6c218 100644
+index fc6892af6621..0ee97ec6c218 100644
--- third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
+++ third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -6712,7 +6744,7 @@ index b8385d1daacd..0ee97ec6c218 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6777,6 +6809,7 @@ index b8385d1daacd..0ee97ec6c218 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -6821,7 +6854,7 @@ index b8385d1daacd..0ee97ec6c218 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -6881,7 +6914,7 @@ index b8385d1daacd..0ee97ec6c218 100644
-
Library("frame_encryptor_interface_gn")
diff --git third_party/libwebrtc/api/crypto/options_gn/moz.build third_party/libwebrtc/api/crypto/options_gn/moz.build
-index aee1983c3e76..c6ad466bcf88 100644
+index 252c6e021d12..c6ad466bcf88 100644
--- third_party/libwebrtc/api/crypto/options_gn/moz.build
+++ third_party/libwebrtc/api/crypto/options_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -6905,7 +6938,7 @@ index aee1983c3e76..c6ad466bcf88 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,176 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6966,6 +6999,7 @@ index aee1983c3e76..c6ad466bcf88 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -7088,7 +7122,7 @@ index aee1983c3e76..c6ad466bcf88 100644
Library("options_gn")
diff --git third_party/libwebrtc/api/fec_controller_api_gn/moz.build third_party/libwebrtc/api/fec_controller_api_gn/moz.build
-index 014e7fe571aa..0e340edaa9b8 100644
+index 8f7d88432678..0e340edaa9b8 100644
--- third_party/libwebrtc/api/fec_controller_api_gn/moz.build
+++ third_party/libwebrtc/api/fec_controller_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -7112,7 +7146,7 @@ index 014e7fe571aa..0e340edaa9b8 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7173,6 +7207,7 @@ index 014e7fe571aa..0e340edaa9b8 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -7217,7 +7252,7 @@ index 014e7fe571aa..0e340edaa9b8 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -7277,7 +7312,7 @@ index 014e7fe571aa..0e340edaa9b8 100644
-
Library("fec_controller_api_gn")
diff --git third_party/libwebrtc/api/field_trials_registry_gn/moz.build third_party/libwebrtc/api/field_trials_registry_gn/moz.build
-index f8884b4cd26a..bb3da46c855c 100644
+index e105574d498d..bb3da46c855c 100644
--- third_party/libwebrtc/api/field_trials_registry_gn/moz.build
+++ third_party/libwebrtc/api/field_trials_registry_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -7301,7 +7336,7 @@ index f8884b4cd26a..bb3da46c855c 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7366,6 +7401,7 @@ index f8884b4cd26a..bb3da46c855c 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -7492,7 +7528,7 @@ index f8884b4cd26a..bb3da46c855c 100644
Library("field_trials_registry_gn")
diff --git third_party/libwebrtc/api/field_trials_view_gn/moz.build third_party/libwebrtc/api/field_trials_view_gn/moz.build
-index 2c7f147d4afb..3078bdae753b 100644
+index 39a6ff80e8c9..3078bdae753b 100644
--- third_party/libwebrtc/api/field_trials_view_gn/moz.build
+++ third_party/libwebrtc/api/field_trials_view_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -7516,7 +7552,7 @@ index 2c7f147d4afb..3078bdae753b 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7577,6 +7613,7 @@ index 2c7f147d4afb..3078bdae753b 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -7621,7 +7658,7 @@ index 2c7f147d4afb..3078bdae753b 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -7681,7 +7718,7 @@ index 2c7f147d4afb..3078bdae753b 100644
-
Library("field_trials_view_gn")
diff --git third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
-index 885c8437ae88..43b4eeb1d4f0 100644
+index ef81027714d8..43b4eeb1d4f0 100644
--- third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
+++ third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -7705,7 +7742,7 @@ index 885c8437ae88..43b4eeb1d4f0 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7774,6 +7811,7 @@ index 885c8437ae88..43b4eeb1d4f0 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -7825,7 +7863,7 @@ index 885c8437ae88..43b4eeb1d4f0 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -161,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -7885,7 +7923,7 @@ index 885c8437ae88..43b4eeb1d4f0 100644
-
Library("frame_transformer_interface_gn")
diff --git third_party/libwebrtc/api/function_view_gn/moz.build third_party/libwebrtc/api/function_view_gn/moz.build
-index 59ebc4ae7ad2..53144eed7f3b 100644
+index 9acc4015af79..53144eed7f3b 100644
--- third_party/libwebrtc/api/function_view_gn/moz.build
+++ third_party/libwebrtc/api/function_view_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -7909,7 +7947,7 @@ index 59ebc4ae7ad2..53144eed7f3b 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7974,6 +8012,7 @@ index 59ebc4ae7ad2..53144eed7f3b 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -8018,7 +8057,7 @@ index 59ebc4ae7ad2..53144eed7f3b 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -8078,7 +8117,7 @@ index 59ebc4ae7ad2..53144eed7f3b 100644
-
Library("function_view_gn")
diff --git third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
-index 5e41eca1b72c..a918a1104b37 100644
+index 708cabfc90c4..a918a1104b37 100644
--- third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
+++ third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -8102,7 +8141,7 @@ index 5e41eca1b72c..a918a1104b37 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8163,6 +8202,7 @@ index 5e41eca1b72c..a918a1104b37 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -8207,7 +8247,7 @@ index 5e41eca1b72c..a918a1104b37 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -8267,7 +8307,7 @@ index 5e41eca1b72c..a918a1104b37 100644
-
Library("jingle_logging_api_gn")
diff --git third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
-index 579b7f164b6a..bdbc0d078b7f 100644
+index ed1b2f9cf11c..bdbc0d078b7f 100644
--- third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
+++ third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -8291,7 +8331,7 @@ index 579b7f164b6a..bdbc0d078b7f 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8352,6 +8392,7 @@ index 579b7f164b6a..bdbc0d078b7f 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -8396,7 +8437,7 @@ index 579b7f164b6a..bdbc0d078b7f 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -8456,7 +8497,7 @@ index 579b7f164b6a..bdbc0d078b7f 100644
-
Library("jingle_peerconnection_api_gn")
diff --git third_party/libwebrtc/api/location_gn/moz.build third_party/libwebrtc/api/location_gn/moz.build
-index 434406691e4c..0251460ee9f6 100644
+index d6d7c4901a0a..0251460ee9f6 100644
--- third_party/libwebrtc/api/location_gn/moz.build
+++ third_party/libwebrtc/api/location_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -8480,7 +8521,7 @@ index 434406691e4c..0251460ee9f6 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8541,6 +8582,7 @@ index 434406691e4c..0251460ee9f6 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -8585,7 +8627,7 @@ index 434406691e4c..0251460ee9f6 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -8645,7 +8687,7 @@ index 434406691e4c..0251460ee9f6 100644
-
Library("location_gn")
diff --git third_party/libwebrtc/api/make_ref_counted_gn/moz.build third_party/libwebrtc/api/make_ref_counted_gn/moz.build
-index 8b3a500acb00..2565408ce87a 100644
+index 289b08052239..2565408ce87a 100644
--- third_party/libwebrtc/api/make_ref_counted_gn/moz.build
+++ third_party/libwebrtc/api/make_ref_counted_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -8669,7 +8711,7 @@ index 8b3a500acb00..2565408ce87a 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8730,6 +8772,7 @@ index 8b3a500acb00..2565408ce87a 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -8774,7 +8817,7 @@ index 8b3a500acb00..2565408ce87a 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -8834,7 +8877,7 @@ index 8b3a500acb00..2565408ce87a 100644
-
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 b80f10168f55..7aea55ea197a 100644
+index 0f053a0e9732..7aea55ea197a 100644
--- third_party/libwebrtc/api/media_stream_interface_gn/moz.build
+++ third_party/libwebrtc/api/media_stream_interface_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -8858,7 +8901,7 @@ index b80f10168f55..7aea55ea197a 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8923,6 +8966,7 @@ index b80f10168f55..7aea55ea197a 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -9049,7 +9093,7 @@ index b80f10168f55..7aea55ea197a 100644
Library("media_stream_interface_gn")
diff --git third_party/libwebrtc/api/metronome/metronome_gn/moz.build third_party/libwebrtc/api/metronome/metronome_gn/moz.build
-index dce0ca43192e..9559599c7097 100644
+index e1a50bdc44b3..9559599c7097 100644
--- third_party/libwebrtc/api/metronome/metronome_gn/moz.build
+++ third_party/libwebrtc/api/metronome/metronome_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -9073,7 +9117,7 @@ index dce0ca43192e..9559599c7097 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9138,6 +9182,7 @@ index dce0ca43192e..9559599c7097 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -9182,7 +9227,7 @@ index dce0ca43192e..9559599c7097 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -9242,7 +9287,7 @@ index dce0ca43192e..9559599c7097 100644
-
Library("metronome_gn")
diff --git third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
-index 273be80f73aa..3def73b6e920 100644
+index 2b2a9624b435..3def73b6e920 100644
--- third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
+++ third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -9266,7 +9311,7 @@ index 273be80f73aa..3def73b6e920 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9335,6 +9380,7 @@ index 273be80f73aa..3def73b6e920 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -9464,7 +9510,7 @@ index 273be80f73aa..3def73b6e920 100644
Library("default_neteq_controller_factory_gn")
diff --git third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
-index f06937f581eb..909633162ae6 100644
+index c41da3b9396f..909633162ae6 100644
--- third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
+++ third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -9488,7 +9534,7 @@ index f06937f581eb..909633162ae6 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9557,6 +9603,7 @@ index f06937f581eb..909633162ae6 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -9686,7 +9733,7 @@ index f06937f581eb..909633162ae6 100644
Library("neteq_api_gn")
diff --git third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
-index d09b5aed5335..b63d342a355c 100644
+index 9de0a88ffdfc..b63d342a355c 100644
--- third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
+++ third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -9710,7 +9757,7 @@ index d09b5aed5335..b63d342a355c 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9779,6 +9826,7 @@ index d09b5aed5335..b63d342a355c 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -9830,7 +9878,7 @@ index d09b5aed5335..b63d342a355c 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -161,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -9890,7 +9938,7 @@ index d09b5aed5335..b63d342a355c 100644
-
Library("neteq_controller_api_gn")
diff --git third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
-index 012522550973..10f3a99bcbcd 100644
+index e5ce9fb71897..10f3a99bcbcd 100644
--- third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
+++ third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -9914,7 +9962,7 @@ index 012522550973..10f3a99bcbcd 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9979,6 +10027,7 @@ index 012522550973..10f3a99bcbcd 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -10101,7 +10150,7 @@ index 012522550973..10f3a99bcbcd 100644
Library("tick_timer_gn")
diff --git third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
-index 2a95233bda53..7f30532ddb95 100644
+index e57a49f708fb..7f30532ddb95 100644
--- third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
+++ third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -10125,7 +10174,7 @@ index 2a95233bda53..7f30532ddb95 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10186,6 +10235,7 @@ index 2a95233bda53..7f30532ddb95 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -10230,7 +10280,7 @@ index 2a95233bda53..7f30532ddb95 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -10290,7 +10340,7 @@ index 2a95233bda53..7f30532ddb95 100644
-
Library("network_state_predictor_api_gn")
diff --git third_party/libwebrtc/api/priority_gn/moz.build third_party/libwebrtc/api/priority_gn/moz.build
-index 08cb5bf2d567..461d52f93d0e 100644
+index 5436f2c351a1..461d52f93d0e 100644
--- third_party/libwebrtc/api/priority_gn/moz.build
+++ third_party/libwebrtc/api/priority_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -10314,7 +10364,7 @@ index 08cb5bf2d567..461d52f93d0e 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10375,6 +10425,7 @@ index 08cb5bf2d567..461d52f93d0e 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -10419,7 +10470,7 @@ index 08cb5bf2d567..461d52f93d0e 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -10479,7 +10530,7 @@ index 08cb5bf2d567..461d52f93d0e 100644
-
Library("priority_gn")
diff --git third_party/libwebrtc/api/refcountedbase_gn/moz.build third_party/libwebrtc/api/refcountedbase_gn/moz.build
-index f2a22be84640..b048864ad448 100644
+index f69b13a731a3..b048864ad448 100644
--- third_party/libwebrtc/api/refcountedbase_gn/moz.build
+++ third_party/libwebrtc/api/refcountedbase_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -10503,7 +10554,7 @@ index f2a22be84640..b048864ad448 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10564,6 +10615,7 @@ index f2a22be84640..b048864ad448 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -10608,7 +10660,7 @@ index f2a22be84640..b048864ad448 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -10668,7 +10720,7 @@ index f2a22be84640..b048864ad448 100644
-
Library("refcountedbase_gn")
diff --git third_party/libwebrtc/api/rtc_error_gn/moz.build third_party/libwebrtc/api/rtc_error_gn/moz.build
-index 07efa1cf5563..fcf285f401fc 100644
+index aaa86c696fa6..fcf285f401fc 100644
--- third_party/libwebrtc/api/rtc_error_gn/moz.build
+++ third_party/libwebrtc/api/rtc_error_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -10692,7 +10744,7 @@ index 07efa1cf5563..fcf285f401fc 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10757,6 +10809,7 @@ index 07efa1cf5563..fcf285f401fc 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -10883,7 +10936,7 @@ index 07efa1cf5563..fcf285f401fc 100644
Library("rtc_error_gn")
diff --git third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
-index a96be6791fdc..68470ecf6df4 100644
+index 180dfb1ff4b4..68470ecf6df4 100644
--- third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
+++ third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -10907,7 +10960,7 @@ index a96be6791fdc..68470ecf6df4 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,184 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10972,6 +11025,7 @@ index a96be6791fdc..68470ecf6df4 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -11098,7 +11152,7 @@ index a96be6791fdc..68470ecf6df4 100644
Library("rtc_event_log_gn")
diff --git third_party/libwebrtc/api/rtp_headers_gn/moz.build third_party/libwebrtc/api/rtp_headers_gn/moz.build
-index d26fa6a026f9..b5647f419f7c 100644
+index 1641b4594ef6..b5647f419f7c 100644
--- third_party/libwebrtc/api/rtp_headers_gn/moz.build
+++ third_party/libwebrtc/api/rtp_headers_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -11122,7 +11176,7 @@ index d26fa6a026f9..b5647f419f7c 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11187,6 +11241,7 @@ index d26fa6a026f9..b5647f419f7c 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -11313,7 +11368,7 @@ index d26fa6a026f9..b5647f419f7c 100644
Library("rtp_headers_gn")
diff --git third_party/libwebrtc/api/rtp_packet_info_gn/moz.build third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
-index 99c25cbbaead..df1cf58c7083 100644
+index d331490f9baf..df1cf58c7083 100644
--- third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
+++ third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -11337,7 +11392,7 @@ index 99c25cbbaead..df1cf58c7083 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11402,6 +11457,7 @@ index 99c25cbbaead..df1cf58c7083 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -11528,7 +11584,7 @@ index 99c25cbbaead..df1cf58c7083 100644
Library("rtp_packet_info_gn")
diff --git third_party/libwebrtc/api/rtp_parameters_gn/moz.build third_party/libwebrtc/api/rtp_parameters_gn/moz.build
-index 4dc6e4a74378..ddc2e7f5536f 100644
+index 520476ac0560..ddc2e7f5536f 100644
--- third_party/libwebrtc/api/rtp_parameters_gn/moz.build
+++ third_party/libwebrtc/api/rtp_parameters_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -11552,7 +11608,7 @@ index 4dc6e4a74378..ddc2e7f5536f 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,180 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11617,6 +11673,7 @@ index 4dc6e4a74378..ddc2e7f5536f 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -11739,7 +11796,7 @@ index 4dc6e4a74378..ddc2e7f5536f 100644
Library("rtp_parameters_gn")
diff --git third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
-index 9712e13ddd16..5f6e81fb3f4e 100644
+index ac0c98a19350..5f6e81fb3f4e 100644
--- third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
+++ third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -11763,7 +11820,7 @@ index 9712e13ddd16..5f6e81fb3f4e 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11824,6 +11881,7 @@ index 9712e13ddd16..5f6e81fb3f4e 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -11868,7 +11926,7 @@ index 9712e13ddd16..5f6e81fb3f4e 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -11928,7 +11986,7 @@ index 9712e13ddd16..5f6e81fb3f4e 100644
-
Library("rtp_sender_interface_gn")
diff --git third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
-index 5cc94b1d99f7..f274d0055498 100644
+index 7e18b2e7cc9d..f274d0055498 100644
--- third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
+++ third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -11952,7 +12010,7 @@ index 5cc94b1d99f7..f274d0055498 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12017,6 +12075,7 @@ index 5cc94b1d99f7..f274d0055498 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -12143,7 +12202,7 @@ index 5cc94b1d99f7..f274d0055498 100644
Library("rtp_sender_setparameters_callback_gn")
diff --git third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
-index 1ca9b4be66c4..a4bf4591450e 100644
+index 2b0d37565ec8..a4bf4591450e 100644
--- third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
+++ third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -12167,7 +12226,7 @@ index 1ca9b4be66c4..a4bf4591450e 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12228,6 +12287,7 @@ index 1ca9b4be66c4..a4bf4591450e 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -12272,7 +12332,7 @@ index 1ca9b4be66c4..a4bf4591450e 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -12332,7 +12392,7 @@ index 1ca9b4be66c4..a4bf4591450e 100644
-
Library("rtp_transceiver_direction_gn")
diff --git third_party/libwebrtc/api/scoped_refptr_gn/moz.build third_party/libwebrtc/api/scoped_refptr_gn/moz.build
-index d4dbda2c18f8..951e821afca9 100644
+index 532aa24725fd..951e821afca9 100644
--- third_party/libwebrtc/api/scoped_refptr_gn/moz.build
+++ third_party/libwebrtc/api/scoped_refptr_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -12356,7 +12416,7 @@ index d4dbda2c18f8..951e821afca9 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12417,6 +12477,7 @@ index d4dbda2c18f8..951e821afca9 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -12461,7 +12522,7 @@ index d4dbda2c18f8..951e821afca9 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -12521,7 +12582,7 @@ index d4dbda2c18f8..951e821afca9 100644
-
Library("scoped_refptr_gn")
diff --git third_party/libwebrtc/api/sequence_checker_gn/moz.build third_party/libwebrtc/api/sequence_checker_gn/moz.build
-index d3dd3980f86a..81e314ac9523 100644
+index 0ffdd1ceb77f..81e314ac9523 100644
--- third_party/libwebrtc/api/sequence_checker_gn/moz.build
+++ third_party/libwebrtc/api/sequence_checker_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -12545,7 +12606,7 @@ index d3dd3980f86a..81e314ac9523 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12610,6 +12671,7 @@ index d3dd3980f86a..81e314ac9523 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -12654,7 +12716,7 @@ index d3dd3980f86a..81e314ac9523 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -12714,7 +12776,7 @@ index d3dd3980f86a..81e314ac9523 100644
-
Library("sequence_checker_gn")
diff --git third_party/libwebrtc/api/simulated_network_api_gn/moz.build third_party/libwebrtc/api/simulated_network_api_gn/moz.build
-index 0867200479f4..04a99f0b12ea 100644
+index 1acee4faa0e8..04a99f0b12ea 100644
--- third_party/libwebrtc/api/simulated_network_api_gn/moz.build
+++ third_party/libwebrtc/api/simulated_network_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -12738,7 +12800,7 @@ index 0867200479f4..04a99f0b12ea 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12803,6 +12865,7 @@ index 0867200479f4..04a99f0b12ea 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -12847,7 +12910,7 @@ index 0867200479f4..04a99f0b12ea 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -12907,7 +12970,7 @@ index 0867200479f4..04a99f0b12ea 100644
-
Library("simulated_network_api_gn")
diff --git third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
-index d7e6a087fa00..ba1a6b109e0e 100644
+index 4bc637d87c92..ba1a6b109e0e 100644
--- third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
+++ third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -12931,7 +12994,7 @@ index d7e6a087fa00..ba1a6b109e0e 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12996,6 +13059,7 @@ index d7e6a087fa00..ba1a6b109e0e 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -13118,7 +13182,7 @@ index d7e6a087fa00..ba1a6b109e0e 100644
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 c4d9c9d67d0a..7ff2201844db 100644
+index 7026eeea61ac..7ff2201844db 100644
--- third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
+++ third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -13142,7 +13206,7 @@ index c4d9c9d67d0a..7ff2201844db 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13207,6 +13271,7 @@ index c4d9c9d67d0a..7ff2201844db 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -13329,7 +13394,7 @@ index c4d9c9d67d0a..7ff2201844db 100644
Library("task_queue_gn")
diff --git third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
-index fba5b45a5df7..39a9ebc0842e 100644
+index d09913813a7e..39a9ebc0842e 100644
--- third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
+++ third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -13353,7 +13418,7 @@ index fba5b45a5df7..39a9ebc0842e 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,176 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13414,6 +13479,7 @@ index fba5b45a5df7..39a9ebc0842e 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -13536,7 +13602,7 @@ index fba5b45a5df7..39a9ebc0842e 100644
Library("bitrate_settings_gn")
diff --git third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
-index ac59bcbcde75..cbeb41795c2d 100644
+index 5bd7a14d5ed6..cbeb41795c2d 100644
--- third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
+++ third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -13560,7 +13626,7 @@ index ac59bcbcde75..cbeb41795c2d 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13625,6 +13691,7 @@ index ac59bcbcde75..cbeb41795c2d 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -13673,7 +13740,7 @@ index ac59bcbcde75..cbeb41795c2d 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -154,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -13733,7 +13800,7 @@ index ac59bcbcde75..cbeb41795c2d 100644
-
Library("datagram_transport_interface_gn")
diff --git third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
-index 1ef79b4d200b..e4486979adcc 100644
+index 38a5c45915e9..e4486979adcc 100644
--- third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
+++ third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -13757,7 +13824,7 @@ index 1ef79b4d200b..e4486979adcc 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13822,6 +13889,7 @@ index 1ef79b4d200b..e4486979adcc 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -13948,7 +14016,7 @@ index 1ef79b4d200b..e4486979adcc 100644
Library("field_trial_based_config_gn")
diff --git third_party/libwebrtc/api/transport/goog_cc_gn/moz.build third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
-index 69fd4ce27866..dee377f35156 100644
+index d88a604315bf..dee377f35156 100644
--- third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
+++ third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -13972,7 +14040,7 @@ index 69fd4ce27866..dee377f35156 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,192 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14042,6 +14110,7 @@ index 69fd4ce27866..dee377f35156 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -14171,7 +14240,7 @@ index 69fd4ce27866..dee377f35156 100644
Library("goog_cc_gn")
diff --git third_party/libwebrtc/api/transport/network_control_gn/moz.build third_party/libwebrtc/api/transport/network_control_gn/moz.build
-index 181843597f7a..f03b20773145 100644
+index 2a3988f5695d..f03b20773145 100644
--- third_party/libwebrtc/api/transport/network_control_gn/moz.build
+++ third_party/libwebrtc/api/transport/network_control_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -14195,7 +14264,7 @@ index 181843597f7a..f03b20773145 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14260,6 +14329,7 @@ index 181843597f7a..f03b20773145 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -14386,7 +14456,7 @@ index 181843597f7a..f03b20773145 100644
Library("network_control_gn")
diff --git third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
-index 0ee9e1fa1b7e..8c55ec075d15 100644
+index a662091d3eef..8c55ec075d15 100644
--- third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
+++ third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -14410,7 +14480,7 @@ index 0ee9e1fa1b7e..8c55ec075d15 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14475,6 +14545,7 @@ index 0ee9e1fa1b7e..8c55ec075d15 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -14597,7 +14668,7 @@ index 0ee9e1fa1b7e..8c55ec075d15 100644
Library("dependency_descriptor_gn")
diff --git third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
-index b43f4a77ec51..7862f9ee7c3d 100644
+index 324f779cb8f0..7862f9ee7c3d 100644
--- third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
+++ third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -14621,7 +14692,7 @@ index b43f4a77ec51..7862f9ee7c3d 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14686,6 +14757,7 @@ index b43f4a77ec51..7862f9ee7c3d 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -14734,7 +14806,7 @@ index b43f4a77ec51..7862f9ee7c3d 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -154,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -14794,7 +14866,7 @@ index b43f4a77ec51..7862f9ee7c3d 100644
-
Library("rtp_source_gn")
diff --git third_party/libwebrtc/api/transport/stun_types_gn/moz.build third_party/libwebrtc/api/transport/stun_types_gn/moz.build
-index dd75da361bf7..39d0ef9756e1 100644
+index 6bf7ef309680..39d0ef9756e1 100644
--- third_party/libwebrtc/api/transport/stun_types_gn/moz.build
+++ third_party/libwebrtc/api/transport/stun_types_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -14818,7 +14890,7 @@ index dd75da361bf7..39d0ef9756e1 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14879,6 +14951,7 @@ index dd75da361bf7..39d0ef9756e1 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -14923,7 +14996,7 @@ index dd75da361bf7..39d0ef9756e1 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -14983,7 +15056,7 @@ index dd75da361bf7..39d0ef9756e1 100644
-
Library("stun_types_gn")
diff --git third_party/libwebrtc/api/transport_api_gn/moz.build third_party/libwebrtc/api/transport_api_gn/moz.build
-index 5335c2c5196b..98964899137c 100644
+index 77a120da7d27..98964899137c 100644
--- third_party/libwebrtc/api/transport_api_gn/moz.build
+++ third_party/libwebrtc/api/transport_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -15007,7 +15080,7 @@ index 5335c2c5196b..98964899137c 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,176 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15068,6 +15141,7 @@ index 5335c2c5196b..98964899137c 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -15190,7 +15264,7 @@ index 5335c2c5196b..98964899137c 100644
Library("transport_api_gn")
diff --git third_party/libwebrtc/api/units/data_rate_gn/moz.build third_party/libwebrtc/api/units/data_rate_gn/moz.build
-index de76b8e11c82..710093b8259e 100644
+index d8f82d3a1cee..710093b8259e 100644
--- third_party/libwebrtc/api/units/data_rate_gn/moz.build
+++ third_party/libwebrtc/api/units/data_rate_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -15214,7 +15288,7 @@ index de76b8e11c82..710093b8259e 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15279,6 +15353,7 @@ index de76b8e11c82..710093b8259e 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -15401,7 +15476,7 @@ index de76b8e11c82..710093b8259e 100644
Library("data_rate_gn")
diff --git third_party/libwebrtc/api/units/data_size_gn/moz.build third_party/libwebrtc/api/units/data_size_gn/moz.build
-index dc54ce4f156e..ef4aba55e68f 100644
+index d853774794c3..ef4aba55e68f 100644
--- third_party/libwebrtc/api/units/data_size_gn/moz.build
+++ third_party/libwebrtc/api/units/data_size_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -15425,7 +15500,7 @@ index dc54ce4f156e..ef4aba55e68f 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15490,6 +15565,7 @@ index dc54ce4f156e..ef4aba55e68f 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -15612,7 +15688,7 @@ index dc54ce4f156e..ef4aba55e68f 100644
Library("data_size_gn")
diff --git third_party/libwebrtc/api/units/frequency_gn/moz.build third_party/libwebrtc/api/units/frequency_gn/moz.build
-index 3c84c283b8ec..07ce5ab7d03d 100644
+index 327675f5f3df..07ce5ab7d03d 100644
--- third_party/libwebrtc/api/units/frequency_gn/moz.build
+++ third_party/libwebrtc/api/units/frequency_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -15636,7 +15712,7 @@ index 3c84c283b8ec..07ce5ab7d03d 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15701,6 +15777,7 @@ index 3c84c283b8ec..07ce5ab7d03d 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -15823,7 +15900,7 @@ index 3c84c283b8ec..07ce5ab7d03d 100644
Library("frequency_gn")
diff --git third_party/libwebrtc/api/units/time_delta_gn/moz.build third_party/libwebrtc/api/units/time_delta_gn/moz.build
-index 3fe57620d83d..99beb9e82767 100644
+index d03e4e4e7622..99beb9e82767 100644
--- third_party/libwebrtc/api/units/time_delta_gn/moz.build
+++ third_party/libwebrtc/api/units/time_delta_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -15847,7 +15924,7 @@ index 3fe57620d83d..99beb9e82767 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15912,6 +15989,7 @@ index 3fe57620d83d..99beb9e82767 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -16034,7 +16112,7 @@ index 3fe57620d83d..99beb9e82767 100644
Library("time_delta_gn")
diff --git third_party/libwebrtc/api/units/timestamp_gn/moz.build third_party/libwebrtc/api/units/timestamp_gn/moz.build
-index a869cbcd713e..41f7f84b1527 100644
+index a59e0e689e83..41f7f84b1527 100644
--- third_party/libwebrtc/api/units/timestamp_gn/moz.build
+++ third_party/libwebrtc/api/units/timestamp_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -16058,7 +16136,7 @@ index a869cbcd713e..41f7f84b1527 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16123,6 +16201,7 @@ index a869cbcd713e..41f7f84b1527 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -16245,7 +16324,7 @@ index a869cbcd713e..41f7f84b1527 100644
Library("timestamp_gn")
diff --git third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
-index 40823f23553c..020bfc89b65a 100644
+index d49b61c9005c..020bfc89b65a 100644
--- third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
+++ third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -16269,7 +16348,7 @@ index 40823f23553c..020bfc89b65a 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,192 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16339,6 +16418,7 @@ index 40823f23553c..020bfc89b65a 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -16468,7 +16548,7 @@ index 40823f23553c..020bfc89b65a 100644
Library("builtin_video_bitrate_allocator_factory_gn")
diff --git third_party/libwebrtc/api/video/encoded_frame_gn/moz.build third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
-index f5aee8c8e896..d43142211cf9 100644
+index 5d024d30e9f2..d43142211cf9 100644
--- third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
+++ third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -16492,7 +16572,7 @@ index f5aee8c8e896..d43142211cf9 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16561,6 +16641,7 @@ index f5aee8c8e896..d43142211cf9 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -16690,7 +16771,7 @@ index f5aee8c8e896..d43142211cf9 100644
Library("encoded_frame_gn")
diff --git third_party/libwebrtc/api/video/encoded_image_gn/moz.build third_party/libwebrtc/api/video/encoded_image_gn/moz.build
-index aebcf21b3767..4c046aa480ac 100644
+index c1c76b29d8a4..4c046aa480ac 100644
--- third_party/libwebrtc/api/video/encoded_image_gn/moz.build
+++ third_party/libwebrtc/api/video/encoded_image_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -16714,7 +16795,7 @@ index aebcf21b3767..4c046aa480ac 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16779,6 +16860,7 @@ index aebcf21b3767..4c046aa480ac 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -16905,7 +16987,7 @@ index aebcf21b3767..4c046aa480ac 100644
Library("encoded_image_gn")
diff --git third_party/libwebrtc/api/video/frame_buffer_gn/moz.build third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
-index 67d7583074d3..ea11fb826b9e 100644
+index 6f8d8b947437..ea11fb826b9e 100644
--- third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
+++ third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -16929,7 +17011,7 @@ index 67d7583074d3..ea11fb826b9e 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,192 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16999,6 +17081,7 @@ index 67d7583074d3..ea11fb826b9e 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -17128,7 +17211,7 @@ index 67d7583074d3..ea11fb826b9e 100644
Library("frame_buffer_gn")
diff --git third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
-index af294ef3ca63..63707a6269b2 100644
+index d6cbcd817ba6..63707a6269b2 100644
--- third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
+++ third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -17152,7 +17235,7 @@ index af294ef3ca63..63707a6269b2 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17217,6 +17300,7 @@ index af294ef3ca63..63707a6269b2 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -17265,7 +17349,7 @@ index af294ef3ca63..63707a6269b2 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -154,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -17325,7 +17409,7 @@ index af294ef3ca63..63707a6269b2 100644
-
Library("recordable_encoded_frame_gn")
diff --git third_party/libwebrtc/api/video/render_resolution_gn/moz.build third_party/libwebrtc/api/video/render_resolution_gn/moz.build
-index 5f97a983f82e..abe0dea08303 100644
+index 46f2db422c1d..abe0dea08303 100644
--- third_party/libwebrtc/api/video/render_resolution_gn/moz.build
+++ third_party/libwebrtc/api/video/render_resolution_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -17349,7 +17433,7 @@ index 5f97a983f82e..abe0dea08303 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17410,6 +17494,7 @@ index 5f97a983f82e..abe0dea08303 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -17454,7 +17539,7 @@ index 5f97a983f82e..abe0dea08303 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -17514,7 +17599,7 @@ index 5f97a983f82e..abe0dea08303 100644
-
Library("render_resolution_gn")
diff --git third_party/libwebrtc/api/video/resolution_gn/moz.build third_party/libwebrtc/api/video/resolution_gn/moz.build
-index deafa478ddb9..10bf77256f20 100644
+index 15d96f409306..10bf77256f20 100644
--- third_party/libwebrtc/api/video/resolution_gn/moz.build
+++ third_party/libwebrtc/api/video/resolution_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -17538,7 +17623,7 @@ index deafa478ddb9..10bf77256f20 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17599,6 +17684,7 @@ index deafa478ddb9..10bf77256f20 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -17643,7 +17729,7 @@ index deafa478ddb9..10bf77256f20 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -17703,7 +17789,7 @@ index deafa478ddb9..10bf77256f20 100644
-
Library("resolution_gn")
diff --git third_party/libwebrtc/api/video/video_adaptation_gn/moz.build third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
-index 3b4495f26c0c..cd0d8268f411 100644
+index a06f4ca3cac6..cd0d8268f411 100644
--- third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
+++ third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -17727,7 +17813,7 @@ index 3b4495f26c0c..cd0d8268f411 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17792,6 +17878,7 @@ index 3b4495f26c0c..cd0d8268f411 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -17914,7 +18001,7 @@ index 3b4495f26c0c..cd0d8268f411 100644
Library("video_adaptation_gn")
diff --git third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
-index 2c7b1f39e7c2..b2366c6af2a0 100644
+index 6ebe9921df53..b2366c6af2a0 100644
--- third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
+++ third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -17938,7 +18025,7 @@ index 2c7b1f39e7c2..b2366c6af2a0 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18003,6 +18090,7 @@ index 2c7b1f39e7c2..b2366c6af2a0 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -18125,7 +18213,7 @@ index 2c7b1f39e7c2..b2366c6af2a0 100644
Library("video_bitrate_allocation_gn")
diff --git third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
-index a6e2e2c6f5a9..8eb8884fe45b 100644
+index 1712dffdc683..8eb8884fe45b 100644
--- third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
+++ third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -18149,7 +18237,7 @@ index a6e2e2c6f5a9..8eb8884fe45b 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18214,6 +18302,7 @@ index a6e2e2c6f5a9..8eb8884fe45b 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -18262,7 +18351,7 @@ index a6e2e2c6f5a9..8eb8884fe45b 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -154,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -18322,7 +18411,7 @@ index a6e2e2c6f5a9..8eb8884fe45b 100644
-
Library("video_bitrate_allocator_factory_gn")
diff --git third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
-index f09476aacb87..7f6b2b8a30ac 100644
+index b203fa6d7475..7f6b2b8a30ac 100644
--- third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
+++ third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -18346,7 +18435,7 @@ index f09476aacb87..7f6b2b8a30ac 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18411,6 +18500,7 @@ index f09476aacb87..7f6b2b8a30ac 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -18533,7 +18623,7 @@ index f09476aacb87..7f6b2b8a30ac 100644
Library("video_bitrate_allocator_gn")
diff --git third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
-index 2ac72c5b5429..b7f4cc420178 100644
+index b8327ec933cb..b7f4cc420178 100644
--- third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
+++ third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -18557,7 +18647,7 @@ index 2ac72c5b5429..b7f4cc420178 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18618,6 +18708,7 @@ index 2ac72c5b5429..b7f4cc420178 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -18662,7 +18753,7 @@ index 2ac72c5b5429..b7f4cc420178 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -18722,7 +18813,7 @@ index 2ac72c5b5429..b7f4cc420178 100644
-
Library("video_codec_constants_gn")
diff --git third_party/libwebrtc/api/video/video_frame_gn/moz.build third_party/libwebrtc/api/video/video_frame_gn/moz.build
-index 7a4e9fdc2c33..c7700a5bcd92 100644
+index 7d21dfb24a71..c7700a5bcd92 100644
--- third_party/libwebrtc/api/video/video_frame_gn/moz.build
+++ third_party/libwebrtc/api/video/video_frame_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -18746,7 +18837,7 @@ index 7a4e9fdc2c33..c7700a5bcd92 100644
FINAL_LIBRARY = "webrtc"
-@@ -54,183 +63,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,184 +63,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18811,6 +18902,7 @@ index 7a4e9fdc2c33..c7700a5bcd92 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -18937,7 +19029,7 @@ index 7a4e9fdc2c33..c7700a5bcd92 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 e56d43a29930..735fd52d03b8 100644
+index 01eabd0d3249..735fd52d03b8 100644
--- third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
+++ third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -18961,7 +19053,7 @@ index e56d43a29930..735fd52d03b8 100644
FINAL_LIBRARY = "webrtc"
-@@ -50,183 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,184 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19026,6 +19118,7 @@ index e56d43a29930..735fd52d03b8 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -19152,7 +19245,7 @@ index e56d43a29930..735fd52d03b8 100644
Library("video_frame_i010_gn")
diff --git third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
-index 2d2221dbb57d..eb03efadbe9a 100644
+index 48f4a170531a..eb03efadbe9a 100644
--- third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
+++ third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -19176,7 +19269,7 @@ index 2d2221dbb57d..eb03efadbe9a 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19241,6 +19334,7 @@ index 2d2221dbb57d..eb03efadbe9a 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -19367,7 +19461,7 @@ index 2d2221dbb57d..eb03efadbe9a 100644
Library("video_frame_metadata_gn")
diff --git third_party/libwebrtc/api/video/video_frame_type_gn/moz.build third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
-index bc4c46bfbdc5..7b04b10d4157 100644
+index 46adc4af5f34..7b04b10d4157 100644
--- third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
+++ third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -19391,7 +19485,7 @@ index bc4c46bfbdc5..7b04b10d4157 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19452,6 +19546,7 @@ index bc4c46bfbdc5..7b04b10d4157 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -19496,7 +19591,7 @@ index bc4c46bfbdc5..7b04b10d4157 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -19556,7 +19651,7 @@ index bc4c46bfbdc5..7b04b10d4157 100644
-
Library("video_frame_type_gn")
diff --git third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
-index ded4d37ab6b7..0129e1ce4ed0 100644
+index 817d778c165b..0129e1ce4ed0 100644
--- third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
+++ third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -19580,7 +19675,7 @@ index ded4d37ab6b7..0129e1ce4ed0 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19645,6 +19740,7 @@ index ded4d37ab6b7..0129e1ce4ed0 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -19689,7 +19785,7 @@ index ded4d37ab6b7..0129e1ce4ed0 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -19749,7 +19845,7 @@ index ded4d37ab6b7..0129e1ce4ed0 100644
-
Library("video_layers_allocation_gn")
diff --git third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
-index fffe252ebd5c..1bdba7c6dffa 100644
+index ebe08ca9fdf2..1bdba7c6dffa 100644
--- third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
+++ third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -19773,7 +19869,7 @@ index fffe252ebd5c..1bdba7c6dffa 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,183 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,184 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19838,6 +19934,7 @@ index fffe252ebd5c..1bdba7c6dffa 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -19964,7 +20061,7 @@ index fffe252ebd5c..1bdba7c6dffa 100644
Library("video_rtp_headers_gn")
diff --git third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
-index e36bc0df9828..cb189ba6fbb8 100644
+index 96a4350fec9b..cb189ba6fbb8 100644
--- third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
+++ third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -19988,7 +20085,7 @@ index e36bc0df9828..cb189ba6fbb8 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20053,6 +20150,7 @@ index e36bc0df9828..cb189ba6fbb8 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -20101,7 +20199,7 @@ index e36bc0df9828..cb189ba6fbb8 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -154,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -20161,7 +20259,7 @@ index e36bc0df9828..cb189ba6fbb8 100644
-
Library("video_stream_encoder_gn")
diff --git third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
-index dcf5d2273c8d..86180d10a821 100644
+index aabf7973ec3e..86180d10a821 100644
--- third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -20185,7 +20283,7 @@ index dcf5d2273c8d..86180d10a821 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20250,6 +20348,7 @@ index dcf5d2273c8d..86180d10a821 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -20294,7 +20393,7 @@ index dcf5d2273c8d..86180d10a821 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -20354,7 +20453,7 @@ index dcf5d2273c8d..86180d10a821 100644
-
Library("bitstream_parser_api_gn")
diff --git third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
-index 987a01bd2f1a..dfcfda00467b 100644
+index 83c15c45c4b7..dfcfda00467b 100644
--- third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -20378,7 +20477,7 @@ index 987a01bd2f1a..dfcfda00467b 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,192 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20448,6 +20547,7 @@ index 987a01bd2f1a..dfcfda00467b 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -20577,7 +20677,7 @@ index 987a01bd2f1a..dfcfda00467b 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 a308bfc58fd9..50cd221a39d7 100644
+index 5817876c23d3..50cd221a39d7 100644
--- third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -20601,7 +20701,7 @@ index a308bfc58fd9..50cd221a39d7 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20666,6 +20766,7 @@ index a308bfc58fd9..50cd221a39d7 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -20788,7 +20889,7 @@ index a308bfc58fd9..50cd221a39d7 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 eccdc6cfc778..748f6fb1b597 100644
+index b834c671ea9e..748f6fb1b597 100644
--- third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -20812,7 +20913,7 @@ index eccdc6cfc778..748f6fb1b597 100644
FINAL_LIBRARY = "webrtc"
-@@ -53,183 +62,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,184 +62,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20877,6 +20978,7 @@ index eccdc6cfc778..748f6fb1b597 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -21003,7 +21105,7 @@ index eccdc6cfc778..748f6fb1b597 100644
Library("video_codecs_api_gn")
diff --git third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
-index 41d547569586..2b71c8370242 100644
+index d85e55ac74e9..2b71c8370242 100644
--- third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -21027,7 +21129,7 @@ index 41d547569586..2b71c8370242 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,192 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21097,6 +21199,7 @@ index 41d547569586..2b71c8370242 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -21226,7 +21329,7 @@ index 41d547569586..2b71c8370242 100644
Library("vp8_temporal_layers_factory_gn")
diff --git third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
-index 77f7ba4d70db..524de95cf6e8 100644
+index 242fc4076dc9..524de95cf6e8 100644
--- third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
+++ third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -21250,7 +21353,7 @@ index 77f7ba4d70db..524de95cf6e8 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21311,6 +21414,7 @@ index 77f7ba4d70db..524de95cf6e8 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -21355,7 +21459,7 @@ index 77f7ba4d70db..524de95cf6e8 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -21415,7 +21519,7 @@ index 77f7ba4d70db..524de95cf6e8 100644
-
Library("video_track_source_constraints_gn")
diff --git third_party/libwebrtc/audio/audio_gn/moz.build third_party/libwebrtc/audio/audio_gn/moz.build
-index 8a35de2e88b4..beb8a0df1b72 100644
+index d5a7476444a4..beb8a0df1b72 100644
--- third_party/libwebrtc/audio/audio_gn/moz.build
+++ third_party/libwebrtc/audio/audio_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -21439,7 +21543,7 @@ index 8a35de2e88b4..beb8a0df1b72 100644
FINAL_LIBRARY = "webrtc"
-@@ -55,191 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -55,192 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21509,6 +21613,7 @@ index 8a35de2e88b4..beb8a0df1b72 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -21638,7 +21743,7 @@ index 8a35de2e88b4..beb8a0df1b72 100644
Library("audio_gn")
diff --git third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
-index 81aea2d62785..1e0bdc5fc767 100644
+index 8581c24422ee..1e0bdc5fc767 100644
--- third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
+++ third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -21662,7 +21767,7 @@ index 81aea2d62785..1e0bdc5fc767 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21731,6 +21836,7 @@ index 81aea2d62785..1e0bdc5fc767 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -21860,7 +21966,7 @@ index 81aea2d62785..1e0bdc5fc767 100644
Library("audio_frame_operations_gn")
diff --git third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
-index b67981ba5850..5bb0f70142e3 100644
+index d7ca4d9c12ba..5bb0f70142e3 100644
--- third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
+++ third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -21884,7 +21990,7 @@ index b67981ba5850..5bb0f70142e3 100644
FINAL_LIBRARY = "webrtc"
-@@ -52,191 +61,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,192 +61,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21954,6 +22060,7 @@ index b67981ba5850..5bb0f70142e3 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -22083,7 +22190,7 @@ index b67981ba5850..5bb0f70142e3 100644
Library("resource_adaptation_gn")
diff --git third_party/libwebrtc/call/audio_sender_interface_gn/moz.build third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
-index 6779dfa7cc01..75c30bf9abf4 100644
+index a76d7380394a..75c30bf9abf4 100644
--- third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
+++ third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -22107,7 +22214,7 @@ index 6779dfa7cc01..75c30bf9abf4 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22172,6 +22279,7 @@ index 6779dfa7cc01..75c30bf9abf4 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -22220,7 +22328,7 @@ index 6779dfa7cc01..75c30bf9abf4 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -154,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -22280,7 +22388,7 @@ index 6779dfa7cc01..75c30bf9abf4 100644
-
Library("audio_sender_interface_gn")
diff --git third_party/libwebrtc/call/bitrate_allocator_gn/moz.build third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
-index ef48a850a44f..7e63d38a987e 100644
+index 9e269f9892a1..7e63d38a987e 100644
--- third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
+++ third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -22304,7 +22412,7 @@ index ef48a850a44f..7e63d38a987e 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22373,6 +22481,7 @@ index ef48a850a44f..7e63d38a987e 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -22502,7 +22611,7 @@ index ef48a850a44f..7e63d38a987e 100644
Library("bitrate_allocator_gn")
diff --git third_party/libwebrtc/call/bitrate_configurator_gn/moz.build third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
-index b70008b5486c..f62f036ab699 100644
+index f577a10a860c..f62f036ab699 100644
--- third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
+++ third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -22526,7 +22635,7 @@ index b70008b5486c..f62f036ab699 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22595,6 +22704,7 @@ index b70008b5486c..f62f036ab699 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -22724,7 +22834,7 @@ index b70008b5486c..f62f036ab699 100644
Library("bitrate_configurator_gn")
diff --git third_party/libwebrtc/call/call_gn/moz.build third_party/libwebrtc/call/call_gn/moz.build
-index 1f5190649461..21474e0e8eb1 100644
+index e8f85c808cb0..21474e0e8eb1 100644
--- third_party/libwebrtc/call/call_gn/moz.build
+++ third_party/libwebrtc/call/call_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -22748,7 +22858,7 @@ index 1f5190649461..21474e0e8eb1 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,192 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22818,6 +22928,7 @@ index 1f5190649461..21474e0e8eb1 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -22947,7 +23058,7 @@ index 1f5190649461..21474e0e8eb1 100644
Library("call_gn")
diff --git third_party/libwebrtc/call/call_interfaces_gn/moz.build third_party/libwebrtc/call/call_interfaces_gn/moz.build
-index 9782bf65f418..d02126352f57 100644
+index 2a5fa2a72c2f..d02126352f57 100644
--- third_party/libwebrtc/call/call_interfaces_gn/moz.build
+++ third_party/libwebrtc/call/call_interfaces_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -22971,7 +23082,7 @@ index 9782bf65f418..d02126352f57 100644
FINAL_LIBRARY = "webrtc"
-@@ -49,190 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,191 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23040,6 +23151,7 @@ index 9782bf65f418..d02126352f57 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -23169,7 +23281,7 @@ index 9782bf65f418..d02126352f57 100644
Library("call_interfaces_gn")
diff --git third_party/libwebrtc/call/receive_stream_interface_gn/moz.build third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
-index 7be3350326f2..2d90f7bf5333 100644
+index 549bd503205d..2d90f7bf5333 100644
--- third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
+++ third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -23193,7 +23305,7 @@ index 7be3350326f2..2d90f7bf5333 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23262,6 +23374,7 @@ index 7be3350326f2..2d90f7bf5333 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -23313,7 +23426,7 @@ index 7be3350326f2..2d90f7bf5333 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -161,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -23373,7 +23486,7 @@ index 7be3350326f2..2d90f7bf5333 100644
-
Library("receive_stream_interface_gn")
diff --git third_party/libwebrtc/call/rtp_interfaces_gn/moz.build third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
-index 8e64b723410f..f0698d5291ce 100644
+index f3c600262bd3..f0698d5291ce 100644
--- third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
+++ third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -23397,7 +23510,7 @@ index 8e64b723410f..f0698d5291ce 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23466,6 +23579,7 @@ index 8e64b723410f..f0698d5291ce 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -23595,7 +23709,7 @@ index 8e64b723410f..f0698d5291ce 100644
Library("rtp_interfaces_gn")
diff --git third_party/libwebrtc/call/rtp_receiver_gn/moz.build third_party/libwebrtc/call/rtp_receiver_gn/moz.build
-index c3f5b80c8581..4b5e64a7b0a9 100644
+index f6d84604e352..4b5e64a7b0a9 100644
--- third_party/libwebrtc/call/rtp_receiver_gn/moz.build
+++ third_party/libwebrtc/call/rtp_receiver_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -23619,7 +23733,7 @@ index c3f5b80c8581..4b5e64a7b0a9 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,192 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23689,6 +23803,7 @@ index c3f5b80c8581..4b5e64a7b0a9 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -23818,7 +23933,7 @@ index c3f5b80c8581..4b5e64a7b0a9 100644
Library("rtp_receiver_gn")
diff --git third_party/libwebrtc/call/rtp_sender_gn/moz.build third_party/libwebrtc/call/rtp_sender_gn/moz.build
-index 1ed4fe8bb42c..2959f53394c1 100644
+index 50741e5d42f8..2959f53394c1 100644
--- third_party/libwebrtc/call/rtp_sender_gn/moz.build
+++ third_party/libwebrtc/call/rtp_sender_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -23842,7 +23957,7 @@ index 1ed4fe8bb42c..2959f53394c1 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,192 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23912,6 +24027,7 @@ index 1ed4fe8bb42c..2959f53394c1 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -24041,7 +24157,7 @@ index 1ed4fe8bb42c..2959f53394c1 100644
Library("rtp_sender_gn")
diff --git third_party/libwebrtc/call/version_gn/moz.build third_party/libwebrtc/call/version_gn/moz.build
-index d6382035216b..b2052c8cd0fb 100644
+index 8fa85ca64b07..b2052c8cd0fb 100644
--- third_party/libwebrtc/call/version_gn/moz.build
+++ third_party/libwebrtc/call/version_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -24065,7 +24181,7 @@ index d6382035216b..b2052c8cd0fb 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,176 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24126,6 +24242,7 @@ index d6382035216b..b2052c8cd0fb 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -24248,7 +24365,7 @@ index d6382035216b..b2052c8cd0fb 100644
Library("version_gn")
diff --git third_party/libwebrtc/call/video_stream_api_gn/moz.build third_party/libwebrtc/call/video_stream_api_gn/moz.build
-index c441da830946..7eea7977d9df 100644
+index f52180065b76..7eea7977d9df 100644
--- third_party/libwebrtc/call/video_stream_api_gn/moz.build
+++ third_party/libwebrtc/call/video_stream_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -24272,7 +24389,7 @@ index c441da830946..7eea7977d9df 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24341,6 +24458,7 @@ index c441da830946..7eea7977d9df 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -24470,7 +24588,7 @@ index c441da830946..7eea7977d9df 100644
Library("video_stream_api_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
-index 5526be7b8bed..30d931689b62 100644
+index 2bb7c94a3725..30d931689b62 100644
--- third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
@@ -17,12 +17,21 @@ CXXFLAGS += [
@@ -24495,7 +24613,7 @@ index 5526be7b8bed..30d931689b62 100644
FINAL_LIBRARY = "webrtc"
-@@ -50,137 +59,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,138 +59,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24565,6 +24683,7 @@ index 5526be7b8bed..30d931689b62 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -24637,7 +24756,7 @@ index 5526be7b8bed..30d931689b62 100644
Library("common_audio_avx2_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build
-index 9381d65ceafe..30c5b7a739fc 100644
+index a285d2d59936..30c5b7a739fc 100644
--- third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -24661,7 +24780,7 @@ index 9381d65ceafe..30c5b7a739fc 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,109 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24722,6 +24841,7 @@ index 9381d65ceafe..30c5b7a739fc 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -24771,7 +24891,7 @@ index 9381d65ceafe..30c5b7a739fc 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -151,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -24831,7 +24951,7 @@ index 9381d65ceafe..30c5b7a739fc 100644
-
Library("common_audio_c_arm_asm_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
-index c9d2d986330f..cbb28b276a83 100644
+index 60ee6cfc164b..cbb28b276a83 100644
--- third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -24855,7 +24975,7 @@ index c9d2d986330f..cbb28b276a83 100644
FINAL_LIBRARY = "webrtc"
-@@ -80,113 +89,12 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -80,114 +89,12 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24942,6 +25062,7 @@ index c9d2d986330f..cbb28b276a83 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -24973,7 +25094,7 @@ index c9d2d986330f..cbb28b276a83 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
-@@ -194,26 +102,10 @@ if CONFIG["OS_TARGET"] == "WINNT":
+@@ -195,26 +102,10 @@ if CONFIG["OS_TARGET"] == "WINNT":
"/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
]
@@ -25000,7 +25121,7 @@ index c9d2d986330f..cbb28b276a83 100644
SOURCES += [
"/third_party/libwebrtc/common_audio/signal_processing/resample_by_2_mips.c"
-@@ -230,8 +122,6 @@ if CONFIG["CPU_ARCH"] == "mips32":
+@@ -231,8 +122,6 @@ if CONFIG["CPU_ARCH"] == "mips32":
if CONFIG["CPU_ARCH"] == "mips64":
@@ -25009,7 +25130,7 @@ index c9d2d986330f..cbb28b276a83 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
"/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c",
-@@ -246,85 +136,13 @@ if CONFIG["CPU_ARCH"] == "ppc64":
+@@ -247,85 +136,13 @@ if CONFIG["CPU_ARCH"] == "ppc64":
"/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
]
@@ -25096,7 +25217,7 @@ index c9d2d986330f..cbb28b276a83 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
-@@ -332,21 +150,9 @@ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+@@ -333,21 +150,9 @@ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
"/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
]
@@ -25120,7 +25241,7 @@ index c9d2d986330f..cbb28b276a83 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
-@@ -354,14 +160,8 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+@@ -355,14 +160,8 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
"/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
]
@@ -25138,7 +25259,7 @@ index c9d2d986330f..cbb28b276a83 100644
Library("common_audio_c_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
-index 90260ba8646c..54512f5b3543 100644
+index 7a43796b2c52..54512f5b3543 100644
--- third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -25162,7 +25283,7 @@ index 90260ba8646c..54512f5b3543 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25231,6 +25352,7 @@ index 90260ba8646c..54512f5b3543 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -25360,7 +25482,7 @@ index 90260ba8646c..54512f5b3543 100644
Library("common_audio_cc_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_gn/moz.build third_party/libwebrtc/common_audio/common_audio_gn/moz.build
-index c7b74d2e510c..1048f961f8f0 100644
+index e9262fe04295..1048f961f8f0 100644
--- third_party/libwebrtc/common_audio/common_audio_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -25384,7 +25506,7 @@ index c7b74d2e510c..1048f961f8f0 100644
FINAL_LIBRARY = "webrtc"
-@@ -56,190 +65,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -56,191 +65,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25453,6 +25575,7 @@ index c7b74d2e510c..1048f961f8f0 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -25582,7 +25705,7 @@ index c7b74d2e510c..1048f961f8f0 100644
Library("common_audio_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build
-index d51e7f4e3541..7d3d05a3e0af 100644
+index 4d06ac630236..7d3d05a3e0af 100644
--- third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build
@@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -25608,7 +25731,7 @@ index d51e7f4e3541..7d3d05a3e0af 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,148 +56,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,149 +56,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25680,6 +25803,7 @@ index d51e7f4e3541..7d3d05a3e0af 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_ARCH_ARM64"] = True
@@ -25759,7 +25883,7 @@ index d51e7f4e3541..7d3d05a3e0af 100644
-
Library("common_audio_neon_c_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build
-index 8df7017bff19..8ad021bcb676 100644
+index 97be131af11f..8ad021bcb676 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()
@@ -25785,7 +25909,7 @@ index 8df7017bff19..8ad021bcb676 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,148 +55,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,149 +55,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25857,6 +25981,7 @@ index 8df7017bff19..8ad021bcb676 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_ARCH_ARM64"] = True
@@ -25936,7 +26061,7 @@ index 8df7017bff19..8ad021bcb676 100644
-
Library("common_audio_neon_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
-index 022ff2845548..81c11ad52373 100644
+index a14d0288c33b..81c11ad52373 100644
--- third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
@@ -12,12 +12,21 @@ AllowCompilerWarnings()
@@ -25961,7 +26086,7 @@ index 022ff2845548..81c11ad52373 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,159 +54,23 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,160 +54,23 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26039,6 +26164,7 @@ index 022ff2845548..81c11ad52373 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -26126,7 +26252,7 @@ index 022ff2845548..81c11ad52373 100644
Library("common_audio_sse2_gn")
diff --git third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
-index 52e5226e09a0..f34663641568 100644
+index 3e85d36442c7..f34663641568 100644
--- third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
+++ third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -26150,7 +26276,7 @@ index 52e5226e09a0..f34663641568 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26219,6 +26345,7 @@ index 52e5226e09a0..f34663641568 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -26348,7 +26475,7 @@ index 52e5226e09a0..f34663641568 100644
Library("fir_filter_factory_gn")
diff --git third_party/libwebrtc/common_audio/fir_filter_gn/moz.build third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
-index f931502550d0..3ccb102e85a9 100644
+index 1adcf568a2a1..3ccb102e85a9 100644
--- third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
+++ third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -26372,7 +26499,7 @@ index f931502550d0..3ccb102e85a9 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26433,6 +26560,7 @@ index f931502550d0..3ccb102e85a9 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -26477,7 +26605,7 @@ index f931502550d0..3ccb102e85a9 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -26537,7 +26665,7 @@ index f931502550d0..3ccb102e85a9 100644
-
Library("fir_filter_gn")
diff --git third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
-index 57e889cebd1b..8dc865c12715 100644
+index 57f76c8c6a16..8dc865c12715 100644
--- third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
+++ third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -26561,7 +26689,7 @@ index 57e889cebd1b..8dc865c12715 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26630,6 +26758,7 @@ index 57e889cebd1b..8dc865c12715 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -26681,7 +26810,7 @@ index 57e889cebd1b..8dc865c12715 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -161,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -26741,7 +26870,7 @@ index 57e889cebd1b..8dc865c12715 100644
-
Library("sinc_resampler_gn")
diff --git third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build
-index 2f5623b61072..284df3697995 100644
+index 19a28dc32329..284df3697995 100644
--- third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build
+++ third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -26765,7 +26894,7 @@ index 2f5623b61072..284df3697995 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,97 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,98 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26834,6 +26963,7 @@ index 2f5623b61072..284df3697995 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -26864,7 +26994,7 @@ index 2f5623b61072..284df3697995 100644
if CONFIG["CPU_ARCH"] == "aarch64":
-@@ -144,133 +63,42 @@ if CONFIG["CPU_ARCH"] == "aarch64":
+@@ -145,133 +63,42 @@ if CONFIG["CPU_ARCH"] == "aarch64":
"/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc"
]
@@ -27008,7 +27138,7 @@ index 2f5623b61072..284df3697995 100644
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 8639a7ae2e0e..3105fcab9d6b 100644
+index 62c0fba896d9..3105fcab9d6b 100644
--- third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build
+++ third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -27032,7 +27162,7 @@ index 8639a7ae2e0e..3105fcab9d6b 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,176 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27093,6 +27223,7 @@ index 8639a7ae2e0e..3105fcab9d6b 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -27215,7 +27346,7 @@ index 8639a7ae2e0e..3105fcab9d6b 100644
Library("fft_size_256_gn")
diff --git third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
-index 4bae7df22774..5d194b7d816a 100644
+index d2d0287623b5..5d194b7d816a 100644
--- third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
+++ third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -27239,7 +27370,7 @@ index 4bae7df22774..5d194b7d816a 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,115 +48,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,116 +48,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27308,6 +27439,7 @@ index 4bae7df22774..5d194b7d816a 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -27358,7 +27490,7 @@ index 4bae7df22774..5d194b7d816a 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_mips.c"
-@@ -155,8 +70,6 @@ if CONFIG["CPU_ARCH"] == "mips32":
+@@ -156,8 +70,6 @@ if CONFIG["CPU_ARCH"] == "mips32":
if CONFIG["CPU_ARCH"] == "mips64":
@@ -27367,7 +27499,7 @@ index 4bae7df22774..5d194b7d816a 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
]
-@@ -167,107 +80,28 @@ if CONFIG["CPU_ARCH"] == "ppc64":
+@@ -168,107 +80,28 @@ if CONFIG["CPU_ARCH"] == "ppc64":
"/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
]
@@ -27481,7 +27613,7 @@ index 4bae7df22774..5d194b7d816a 100644
Library("spl_sqrt_floor_gn")
diff --git third_party/libwebrtc/common_video/common_video_gn/moz.build third_party/libwebrtc/common_video/common_video_gn/moz.build
-index 869db500add1..9e5cdb7e6cce 100644
+index d6fc7c3632a4..9e5cdb7e6cce 100644
--- third_party/libwebrtc/common_video/common_video_gn/moz.build
+++ third_party/libwebrtc/common_video/common_video_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -27505,7 +27637,7 @@ index 869db500add1..9e5cdb7e6cce 100644
FINAL_LIBRARY = "webrtc"
-@@ -55,183 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -55,184 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27570,6 +27702,7 @@ index 869db500add1..9e5cdb7e6cce 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -27696,7 +27829,7 @@ index 869db500add1..9e5cdb7e6cce 100644
Library("common_video_gn")
diff --git third_party/libwebrtc/common_video/frame_counts_gn/moz.build third_party/libwebrtc/common_video/frame_counts_gn/moz.build
-index 6029016a0e4b..0bd2ab0ab211 100644
+index 0d69ba8281d2..0bd2ab0ab211 100644
--- third_party/libwebrtc/common_video/frame_counts_gn/moz.build
+++ third_party/libwebrtc/common_video/frame_counts_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -27720,7 +27853,7 @@ index 6029016a0e4b..0bd2ab0ab211 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27781,6 +27914,7 @@ index 6029016a0e4b..0bd2ab0ab211 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -27825,7 +27959,7 @@ index 6029016a0e4b..0bd2ab0ab211 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -27885,7 +28019,7 @@ index 6029016a0e4b..0bd2ab0ab211 100644
-
Library("frame_counts_gn")
diff --git third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build
-index b09e027176e1..0ab69dd829cb 100644
+index 5498cbba7c3c..0ab69dd829cb 100644
--- third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build
+++ third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -27909,7 +28043,7 @@ index b09e027176e1..0ab69dd829cb 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27974,6 +28108,7 @@ index b09e027176e1..0ab69dd829cb 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -28096,7 +28231,7 @@ index b09e027176e1..0ab69dd829cb 100644
Library("generic_frame_descriptor_gn")
diff --git third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build
-index 2ae645ea741d..82f547782ab4 100644
+index 27d3bb37aa44..82f547782ab4 100644
--- third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build
+++ third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -28120,7 +28255,7 @@ index 2ae645ea741d..82f547782ab4 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28181,6 +28316,7 @@ index 2ae645ea741d..82f547782ab4 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -28225,7 +28361,7 @@ index 2ae645ea741d..82f547782ab4 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -28299,7 +28435,7 @@ index 2f9f14acb430..f8143d2798f0 100644
-
Library("registered_field_trials_header_gn")
diff --git third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
-index ddc4a9cc8bdb..76b97cad597b 100644
+index f70052f36f23..76b97cad597b 100644
--- third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -28323,7 +28459,7 @@ index ddc4a9cc8bdb..76b97cad597b 100644
FINAL_LIBRARY = "webrtc"
-@@ -47,183 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,184 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28388,6 +28524,7 @@ index ddc4a9cc8bdb..76b97cad597b 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -28514,7 +28651,7 @@ index ddc4a9cc8bdb..76b97cad597b 100644
Library("rtc_event_audio_gn")
diff --git third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
-index 270182b2be45..48e47598a034 100644
+index 8fc25dce315c..48e47598a034 100644
--- third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -28538,7 +28675,7 @@ index 270182b2be45..48e47598a034 100644
FINAL_LIBRARY = "webrtc"
-@@ -48,183 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,184 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28603,6 +28740,7 @@ index 270182b2be45..48e47598a034 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -28729,7 +28867,7 @@ index 270182b2be45..48e47598a034 100644
Library("rtc_event_bwe_gn")
diff --git third_party/libwebrtc/logging/rtc_event_field_gn/moz.build third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
-index 7a816f43289d..9c1a7bd6de3f 100644
+index 74aa081cb186..9c1a7bd6de3f 100644
--- third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -28753,7 +28891,7 @@ index 7a816f43289d..9c1a7bd6de3f 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,183 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,184 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28818,6 +28956,7 @@ index 7a816f43289d..9c1a7bd6de3f 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -28944,7 +29083,7 @@ index 7a816f43289d..9c1a7bd6de3f 100644
Library("rtc_event_field_gn")
diff --git third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build
-index d9020f9a56c3..5362e89efe76 100644
+index 90e2882090ab..5362e89efe76 100644
--- third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -28968,7 +29107,7 @@ index d9020f9a56c3..5362e89efe76 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29033,6 +29172,7 @@ index d9020f9a56c3..5362e89efe76 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -29077,7 +29217,7 @@ index d9020f9a56c3..5362e89efe76 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -29137,7 +29277,7 @@ index d9020f9a56c3..5362e89efe76 100644
-
Library("rtc_event_log_parse_status_gn")
diff --git third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
-index ad1c2615454e..7838b57024ae 100644
+index a0a2f85ecf25..7838b57024ae 100644
--- third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -29161,7 +29301,7 @@ index ad1c2615454e..7838b57024ae 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,179 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,180 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29226,6 +29366,7 @@ index ad1c2615454e..7838b57024ae 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -29348,7 +29489,7 @@ index ad1c2615454e..7838b57024ae 100644
Library("rtc_event_number_encodings_gn")
diff --git third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
-index a920e8d64332..ffe265db0851 100644
+index 78992d519f70..ffe265db0851 100644
--- third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -29372,7 +29513,7 @@ index a920e8d64332..ffe265db0851 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29437,6 +29578,7 @@ index a920e8d64332..ffe265db0851 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -29563,7 +29705,7 @@ index a920e8d64332..ffe265db0851 100644
Library("rtc_event_pacing_gn")
diff --git third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
-index bb826e4a720e..b290dc3e72e7 100644
+index e69cf32fd67c..b290dc3e72e7 100644
--- third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -29587,7 +29729,7 @@ index bb826e4a720e..b290dc3e72e7 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,191 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29656,6 +29798,7 @@ index bb826e4a720e..b290dc3e72e7 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -29785,7 +29928,7 @@ index bb826e4a720e..b290dc3e72e7 100644
Library("rtc_event_rtp_rtcp_gn")
diff --git third_party/libwebrtc/logging/rtc_event_video_gn/moz.build third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
-index 423abc9ec40c..cf444b4316cd 100644
+index 5f3539a0f37d..cf444b4316cd 100644
--- third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -29809,7 +29952,7 @@ index 423abc9ec40c..cf444b4316cd 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,184 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29874,6 +30017,7 @@ index 423abc9ec40c..cf444b4316cd 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -30000,7 +30144,7 @@ index 423abc9ec40c..cf444b4316cd 100644
Library("rtc_event_video_gn")
diff --git third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
-index 14ba953e29d3..96ef93e69179 100644
+index 690d57689b4c..96ef93e69179 100644
--- third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -30024,7 +30168,7 @@ index 14ba953e29d3..96ef93e69179 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30089,6 +30233,7 @@ index 14ba953e29d3..96ef93e69179 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -30215,7 +30360,7 @@ index 14ba953e29d3..96ef93e69179 100644
Library("rtc_stream_config_gn")
diff --git third_party/libwebrtc/media/codec_gn/moz.build third_party/libwebrtc/media/codec_gn/moz.build
-index 6b56a082191f..f5bac588d11b 100644
+index 44eb62e22127..f5bac588d11b 100644
--- third_party/libwebrtc/media/codec_gn/moz.build
+++ third_party/libwebrtc/media/codec_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -30239,7 +30384,7 @@ index 6b56a082191f..f5bac588d11b 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30304,6 +30449,7 @@ index 6b56a082191f..f5bac588d11b 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -30430,7 +30576,7 @@ index 6b56a082191f..f5bac588d11b 100644
Library("codec_gn")
diff --git third_party/libwebrtc/media/delayable_gn/moz.build third_party/libwebrtc/media/delayable_gn/moz.build
-index 12b25ac016e3..3a95f5ef1faf 100644
+index a7495471d729..3a95f5ef1faf 100644
--- third_party/libwebrtc/media/delayable_gn/moz.build
+++ third_party/libwebrtc/media/delayable_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -30454,7 +30600,7 @@ index 12b25ac016e3..3a95f5ef1faf 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30515,6 +30661,7 @@ index 12b25ac016e3..3a95f5ef1faf 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -30559,7 +30706,7 @@ index 12b25ac016e3..3a95f5ef1faf 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -30619,7 +30766,7 @@ index 12b25ac016e3..3a95f5ef1faf 100644
-
Library("delayable_gn")
diff --git third_party/libwebrtc/media/media_channel_gn/moz.build third_party/libwebrtc/media/media_channel_gn/moz.build
-index d031085023fb..863e7fde7105 100644
+index 4dc8bd6ca428..863e7fde7105 100644
--- third_party/libwebrtc/media/media_channel_gn/moz.build
+++ third_party/libwebrtc/media/media_channel_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -30643,7 +30790,7 @@ index d031085023fb..863e7fde7105 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,120 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30713,6 +30860,7 @@ index d031085023fb..863e7fde7105 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -30764,7 +30912,7 @@ index d031085023fb..863e7fde7105 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -161,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -162,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -30824,7 +30972,7 @@ index d031085023fb..863e7fde7105 100644
-
Library("media_channel_gn")
diff --git third_party/libwebrtc/media/media_channel_impl_gn/moz.build third_party/libwebrtc/media/media_channel_impl_gn/moz.build
-index 49b90be2fc51..7f0b3bc10a7f 100644
+index edd945d56d4a..7f0b3bc10a7f 100644
--- third_party/libwebrtc/media/media_channel_impl_gn/moz.build
+++ third_party/libwebrtc/media/media_channel_impl_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -30848,7 +30996,7 @@ index 49b90be2fc51..7f0b3bc10a7f 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30909,6 +31057,7 @@ index 49b90be2fc51..7f0b3bc10a7f 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -30953,7 +31102,7 @@ index 49b90be2fc51..7f0b3bc10a7f 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -31013,7 +31162,7 @@ index 49b90be2fc51..7f0b3bc10a7f 100644
-
Library("media_channel_impl_gn")
diff --git third_party/libwebrtc/media/media_constants_gn/moz.build third_party/libwebrtc/media/media_constants_gn/moz.build
-index fb30505356f2..28762fdde6a3 100644
+index 65d70a73b67e..28762fdde6a3 100644
--- third_party/libwebrtc/media/media_constants_gn/moz.build
+++ third_party/libwebrtc/media/media_constants_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -31037,7 +31186,7 @@ index fb30505356f2..28762fdde6a3 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,176 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31098,6 +31247,7 @@ index fb30505356f2..28762fdde6a3 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -31220,7 +31370,7 @@ index fb30505356f2..28762fdde6a3 100644
Library("media_constants_gn")
diff --git third_party/libwebrtc/media/rid_description_gn/moz.build third_party/libwebrtc/media/rid_description_gn/moz.build
-index 73ebe8374986..c11ccc5b2902 100644
+index 7d43f55fff53..c11ccc5b2902 100644
--- third_party/libwebrtc/media/rid_description_gn/moz.build
+++ third_party/libwebrtc/media/rid_description_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -31244,7 +31394,7 @@ index 73ebe8374986..c11ccc5b2902 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31305,6 +31455,7 @@ index 73ebe8374986..c11ccc5b2902 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -31349,7 +31500,7 @@ index 73ebe8374986..c11ccc5b2902 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -31409,7 +31560,7 @@ index 73ebe8374986..c11ccc5b2902 100644
-
Library("rid_description_gn")
diff --git third_party/libwebrtc/media/rtc_media_base_gn/moz.build third_party/libwebrtc/media/rtc_media_base_gn/moz.build
-index a48b9886dd24..fcc31ea11376 100644
+index 0bcef3ddc6fa..fcc31ea11376 100644
--- third_party/libwebrtc/media/rtc_media_base_gn/moz.build
+++ third_party/libwebrtc/media/rtc_media_base_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -31433,7 +31584,7 @@ index a48b9886dd24..fcc31ea11376 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,191 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,192 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31503,6 +31654,7 @@ index a48b9886dd24..fcc31ea11376 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -31632,7 +31784,7 @@ index a48b9886dd24..fcc31ea11376 100644
Library("rtc_media_base_gn")
diff --git third_party/libwebrtc/media/rtc_media_config_gn/moz.build third_party/libwebrtc/media/rtc_media_config_gn/moz.build
-index 568632c48fb8..94c43caef47b 100644
+index 75c9f13a6c63..94c43caef47b 100644
--- third_party/libwebrtc/media/rtc_media_config_gn/moz.build
+++ third_party/libwebrtc/media/rtc_media_config_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -31656,7 +31808,7 @@ index 568632c48fb8..94c43caef47b 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31717,6 +31869,7 @@ index 568632c48fb8..94c43caef47b 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -31761,7 +31914,7 @@ index 568632c48fb8..94c43caef47b 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -31821,7 +31974,7 @@ index 568632c48fb8..94c43caef47b 100644
-
Library("rtc_media_config_gn")
diff --git third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
-index 4293ba6d9066..01eda12bd559 100644
+index f996de1736e6..01eda12bd559 100644
--- third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
+++ third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -31845,7 +31998,7 @@ index 4293ba6d9066..01eda12bd559 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,192 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31915,6 +32068,7 @@ index 4293ba6d9066..01eda12bd559 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -32044,7 +32198,7 @@ index 4293ba6d9066..01eda12bd559 100644
Library("rtc_simulcast_encoder_adapter_gn")
diff --git third_party/libwebrtc/media/rtp_utils_gn/moz.build third_party/libwebrtc/media/rtp_utils_gn/moz.build
-index d12f755865a5..a5d44da104b6 100644
+index 8c8975d554e3..a5d44da104b6 100644
--- third_party/libwebrtc/media/rtp_utils_gn/moz.build
+++ third_party/libwebrtc/media/rtp_utils_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -32068,7 +32222,7 @@ index d12f755865a5..a5d44da104b6 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32129,6 +32283,7 @@ index d12f755865a5..a5d44da104b6 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -32173,7 +32328,7 @@ index d12f755865a5..a5d44da104b6 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -32233,7 +32388,7 @@ index d12f755865a5..a5d44da104b6 100644
-
Library("rtp_utils_gn")
diff --git third_party/libwebrtc/media/stream_params_gn/moz.build third_party/libwebrtc/media/stream_params_gn/moz.build
-index 2deba906b932..65ec7aef0025 100644
+index 0bd146d3a00f..65ec7aef0025 100644
--- third_party/libwebrtc/media/stream_params_gn/moz.build
+++ third_party/libwebrtc/media/stream_params_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -32257,7 +32412,7 @@ index 2deba906b932..65ec7aef0025 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32318,6 +32473,7 @@ index 2deba906b932..65ec7aef0025 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -32362,7 +32518,7 @@ index 2deba906b932..65ec7aef0025 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -32422,7 +32578,7 @@ index 2deba906b932..65ec7aef0025 100644
-
Library("stream_params_gn")
diff --git third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
-index f599fadae2f0..90a52e406005 100644
+index 672365609554..90a52e406005 100644
--- third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
+++ third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -32446,7 +32602,7 @@ index f599fadae2f0..90a52e406005 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32511,6 +32667,7 @@ index f599fadae2f0..90a52e406005 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -32637,7 +32794,7 @@ index f599fadae2f0..90a52e406005 100644
Library("async_audio_processing_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
-index 03d99c93b89a..a1a7c66b6ff0 100644
+index 6de6d897f1be..a1a7c66b6ff0 100644
--- third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -32661,7 +32818,7 @@ index 03d99c93b89a..a1a7c66b6ff0 100644
FINAL_LIBRARY = "webrtc"
-@@ -47,190 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,191 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32730,6 +32887,7 @@ index 03d99c93b89a..a1a7c66b6ff0 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -32859,7 +33017,7 @@ index 03d99c93b89a..a1a7c66b6ff0 100644
Library("audio_coding_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
-index 2826ed8642f9..e8194cf79b99 100644
+index 913ce4614a58..e8194cf79b99 100644
--- third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -32883,7 +33041,7 @@ index 2826ed8642f9..e8194cf79b99 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32944,6 +33102,7 @@ index 2826ed8642f9..e8194cf79b99 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -32988,7 +33147,7 @@ index 2826ed8642f9..e8194cf79b99 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -33048,7 +33207,7 @@ index 2826ed8642f9..e8194cf79b99 100644
-
Library("audio_coding_module_typedefs_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
-index bf852e8442a4..de2e04dffe32 100644
+index cfb5a0f7e572..de2e04dffe32 100644
--- third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -33072,7 +33231,7 @@ index bf852e8442a4..de2e04dffe32 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33137,6 +33296,7 @@ index bf852e8442a4..de2e04dffe32 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -33263,7 +33423,7 @@ index bf852e8442a4..de2e04dffe32 100644
Library("audio_coding_opus_common_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
-index 56b6d50f6cb7..7ef50512ec05 100644
+index c02002dcc947..7ef50512ec05 100644
--- third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -33287,7 +33447,7 @@ index 56b6d50f6cb7..7ef50512ec05 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33356,6 +33516,7 @@ index 56b6d50f6cb7..7ef50512ec05 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -33485,7 +33646,7 @@ index 56b6d50f6cb7..7ef50512ec05 100644
Library("audio_encoder_cng_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
-index 37cf81ad9f54..a17cc5124685 100644
+index dd5c574a76bd..a17cc5124685 100644
--- third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -33509,7 +33670,7 @@ index 37cf81ad9f54..a17cc5124685 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,176 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33570,6 +33731,7 @@ index 37cf81ad9f54..a17cc5124685 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -33692,7 +33854,7 @@ index 37cf81ad9f54..a17cc5124685 100644
Library("audio_network_adaptor_config_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
-index 1d0905ebc109..ba348ebeecff 100644
+index 4cfce8c2f74c..ba348ebeecff 100644
--- third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -33716,7 +33878,7 @@ index 1d0905ebc109..ba348ebeecff 100644
FINAL_LIBRARY = "webrtc"
-@@ -53,190 +62,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,191 +62,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33785,6 +33947,7 @@ index 1d0905ebc109..ba348ebeecff 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -33914,7 +34077,7 @@ index 1d0905ebc109..ba348ebeecff 100644
Library("audio_network_adaptor_gn")
diff --git third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build
-index 206a4ae313fd..145619c84116 100644
+index e6cc1fe4062d..145619c84116 100644
--- third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -33938,7 +34101,7 @@ index 206a4ae313fd..145619c84116 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34007,6 +34170,7 @@ index 206a4ae313fd..145619c84116 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -34136,7 +34300,7 @@ index 206a4ae313fd..145619c84116 100644
Library("default_neteq_factory_gn")
diff --git third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
-index 8322910094eb..7bfe819841af 100644
+index 2df6e3c8edd2..7bfe819841af 100644
--- third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -34160,7 +34324,7 @@ index 8322910094eb..7bfe819841af 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,176 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34221,6 +34385,7 @@ index 8322910094eb..7bfe819841af 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -34343,7 +34508,7 @@ index 8322910094eb..7bfe819841af 100644
Library("g711_c_gn")
diff --git third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
-index 3a21cddc41e2..80e618a7fa10 100644
+index bd1a9d275900..80e618a7fa10 100644
--- third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -34367,7 +34532,7 @@ index 3a21cddc41e2..80e618a7fa10 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,184 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34432,6 +34597,7 @@ index 3a21cddc41e2..80e618a7fa10 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -34558,7 +34724,7 @@ index 3a21cddc41e2..80e618a7fa10 100644
Library("g711_gn")
diff --git third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
-index dc05788b8021..add81cce3212 100644
+index 08787b33eb7c..add81cce3212 100644
--- third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -34582,7 +34748,7 @@ index dc05788b8021..add81cce3212 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,176 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34643,6 +34809,7 @@ index dc05788b8021..add81cce3212 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -34765,7 +34932,7 @@ index dc05788b8021..add81cce3212 100644
Library("g722_c_gn")
diff --git third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
-index 910eef267ffc..d53536655acd 100644
+index d177f4acd05c..d53536655acd 100644
--- third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -34789,7 +34956,7 @@ index 910eef267ffc..d53536655acd 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,184 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34854,6 +35021,7 @@ index 910eef267ffc..d53536655acd 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -34980,7 +35148,7 @@ index 910eef267ffc..d53536655acd 100644
Library("g722_gn")
diff --git third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build
-index 1ff9bdf07a4b..9871fbb1c38f 100644
+index 41df630ed58f..9871fbb1c38f 100644
--- third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -35004,7 +35172,7 @@ index 1ff9bdf07a4b..9871fbb1c38f 100644
FINAL_LIBRARY = "webrtc"
-@@ -111,190 +120,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -111,191 +120,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35073,6 +35241,7 @@ index 1ff9bdf07a4b..9871fbb1c38f 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -35202,7 +35371,7 @@ index 1ff9bdf07a4b..9871fbb1c38f 100644
Library("ilbc_c_gn")
diff --git third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build
-index 4a7279386ee5..b1811c428dda 100644
+index b496b6dd4294..b1811c428dda 100644
--- third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -35226,7 +35395,7 @@ index 4a7279386ee5..b1811c428dda 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35295,6 +35464,7 @@ index 4a7279386ee5..b1811c428dda 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -35424,7 +35594,7 @@ index 4a7279386ee5..b1811c428dda 100644
Library("ilbc_gn")
diff --git third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
-index bb9cdf4460c3..00d886763be2 100644
+index 2b241db41ce3..00d886763be2 100644
--- third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -35448,7 +35618,7 @@ index bb9cdf4460c3..00d886763be2 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35509,6 +35679,7 @@ index bb9cdf4460c3..00d886763be2 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -35553,7 +35724,7 @@ index bb9cdf4460c3..00d886763be2 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -35613,7 +35784,7 @@ index bb9cdf4460c3..00d886763be2 100644
-
Library("isac_bwinfo_gn")
diff --git third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
-index 86f566663ad5..dbed4ddcb476 100644
+index c62913859d4c..dbed4ddcb476 100644
--- third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -35637,7 +35808,7 @@ index 86f566663ad5..dbed4ddcb476 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,175 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,176 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35698,6 +35869,7 @@ index 86f566663ad5..dbed4ddcb476 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -35820,7 +35992,7 @@ index 86f566663ad5..dbed4ddcb476 100644
Library("isac_vad_gn")
diff --git third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
-index b642ffbe952b..9c04c9bb3900 100644
+index 30c17ef7197f..9c04c9bb3900 100644
--- third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -35844,7 +36016,7 @@ index b642ffbe952b..9c04c9bb3900 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35909,6 +36081,7 @@ index b642ffbe952b..9c04c9bb3900 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -36035,7 +36208,7 @@ index b642ffbe952b..9c04c9bb3900 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 823aea6ddaa0..ecf6b3b2fde3 100644
+index 8e8f87b11f8f..ecf6b3b2fde3 100644
--- third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -36059,7 +36232,7 @@ index 823aea6ddaa0..ecf6b3b2fde3 100644
FINAL_LIBRARY = "webrtc"
-@@ -78,190 +87,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -78,191 +87,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36128,6 +36301,7 @@ index 823aea6ddaa0..ecf6b3b2fde3 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -36257,7 +36431,7 @@ index 823aea6ddaa0..ecf6b3b2fde3 100644
Library("neteq_gn")
diff --git third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
-index 54863e95aee7..936368e4205a 100644
+index 84e0a295f629..936368e4205a 100644
--- third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -36281,7 +36455,7 @@ index 54863e95aee7..936368e4205a 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,176 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36342,6 +36516,7 @@ index 54863e95aee7..936368e4205a 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -36464,7 +36639,7 @@ index 54863e95aee7..936368e4205a 100644
Library("pcm16b_c_gn")
diff --git third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
-index afee108cb3a1..436a0dda6fd4 100644
+index f22a2a913cd4..436a0dda6fd4 100644
--- third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -36488,7 +36663,7 @@ index afee108cb3a1..436a0dda6fd4 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,183 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,184 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36553,6 +36728,7 @@ index afee108cb3a1..436a0dda6fd4 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -36679,7 +36855,7 @@ index afee108cb3a1..436a0dda6fd4 100644
Library("pcm16b_gn")
diff --git third_party/libwebrtc/modules/audio_coding/red_gn/moz.build third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
-index c4fa5c8bc4fe..7be902bc7b5d 100644
+index fb39f9f6a26f..7be902bc7b5d 100644
--- third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -36703,7 +36879,7 @@ index c4fa5c8bc4fe..7be902bc7b5d 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36772,6 +36948,7 @@ index c4fa5c8bc4fe..7be902bc7b5d 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -36901,7 +37078,7 @@ index c4fa5c8bc4fe..7be902bc7b5d 100644
Library("red_gn")
diff --git third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
-index 4a9c24069e74..ea61654f618e 100644
+index 8ea3e31f6dd9..ea61654f618e 100644
--- third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -36925,7 +37102,7 @@ index 4a9c24069e74..ea61654f618e 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36994,6 +37171,7 @@ index 4a9c24069e74..ea61654f618e 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -37123,7 +37301,7 @@ index 4a9c24069e74..ea61654f618e 100644
Library("webrtc_cng_gn")
diff --git third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
-index 99ea47c13acc..1edab76c795b 100644
+index 20fde0e64ac9..1edab76c795b 100644
--- third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
@@ -12,6 +12,9 @@ AllowCompilerWarnings()
@@ -37150,7 +37328,7 @@ index 99ea47c13acc..1edab76c795b 100644
FINAL_LIBRARY = "webrtc"
-@@ -48,183 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,184 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37215,6 +37393,7 @@ index 99ea47c13acc..1edab76c795b 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -37341,7 +37520,7 @@ index 99ea47c13acc..1edab76c795b 100644
Library("webrtc_multiopus_gn")
diff --git third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
-index 49fb552b0d38..bdf1cbbf4c27 100644
+index 5e03548319b0..bdf1cbbf4c27 100644
--- third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
@@ -12,6 +12,9 @@ AllowCompilerWarnings()
@@ -37368,7 +37547,7 @@ index 49fb552b0d38..bdf1cbbf4c27 100644
FINAL_LIBRARY = "webrtc"
-@@ -48,190 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,191 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37437,6 +37616,7 @@ index 49fb552b0d38..bdf1cbbf4c27 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -37566,7 +37746,7 @@ index 49fb552b0d38..bdf1cbbf4c27 100644
Library("webrtc_opus_gn")
diff --git third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
-index 20e1d37306c9..604d2ff1160d 100644
+index b24ff8634633..604d2ff1160d 100644
--- third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
@@ -12,6 +12,9 @@ AllowCompilerWarnings()
@@ -37593,7 +37773,7 @@ index 20e1d37306c9..604d2ff1160d 100644
FINAL_LIBRARY = "webrtc"
-@@ -47,183 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,184 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37658,6 +37838,7 @@ index 20e1d37306c9..604d2ff1160d 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -37784,7 +37965,7 @@ index 20e1d37306c9..604d2ff1160d 100644
Library("webrtc_opus_wrapper_gn")
diff --git third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
-index 40ed29f25814..101e685fa20c 100644
+index f5ade1b42680..101e685fa20c 100644
--- third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
+++ third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -37808,7 +37989,7 @@ index 40ed29f25814..101e685fa20c 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37869,6 +38050,7 @@ index 40ed29f25814..101e685fa20c 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -37913,7 +38095,7 @@ index 40ed29f25814..101e685fa20c 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -37973,7 +38155,7 @@ index 40ed29f25814..101e685fa20c 100644
-
Library("audio_device_gn")
diff --git third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
-index c6a45f9a3761..f1359947dd44 100644
+index 38d1ab41e0c5..f1359947dd44 100644
--- third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
+++ third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -37997,7 +38179,7 @@ index c6a45f9a3761..f1359947dd44 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38066,6 +38248,7 @@ index c6a45f9a3761..f1359947dd44 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -38195,7 +38378,7 @@ index c6a45f9a3761..f1359947dd44 100644
Library("audio_frame_manipulator_gn")
diff --git third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
-index fbbc0aeceaeb..580b07079735 100644
+index 9ddb221f803a..580b07079735 100644
--- third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
+++ third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
@@ -12,12 +12,21 @@ AllowCompilerWarnings()
@@ -38220,7 +38403,7 @@ index fbbc0aeceaeb..580b07079735 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,191 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38289,6 +38472,7 @@ index fbbc0aeceaeb..580b07079735 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -38418,7 +38602,7 @@ index fbbc0aeceaeb..580b07079735 100644
Library("audio_mixer_impl_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
-index 60ecc93ab967..556de6ede5e6 100644
+index 6cd8d88b8c81..556de6ede5e6 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -38442,7 +38626,7 @@ index 60ecc93ab967..556de6ede5e6 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38507,6 +38691,7 @@ index 60ecc93ab967..556de6ede5e6 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -38551,7 +38736,7 @@ index 60ecc93ab967..556de6ede5e6 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -38611,7 +38796,7 @@ index 60ecc93ab967..556de6ede5e6 100644
-
Library("adaptive_fir_filter_erl_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
-index fd78a435604d..aed93b9c682d 100644
+index 45d622758a47..aed93b9c682d 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -38635,7 +38820,7 @@ index fd78a435604d..aed93b9c682d 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38704,6 +38889,7 @@ index fd78a435604d..aed93b9c682d 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -38755,7 +38941,7 @@ index fd78a435604d..aed93b9c682d 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -161,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -38815,7 +39001,7 @@ index fd78a435604d..aed93b9c682d 100644
-
Library("adaptive_fir_filter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
-index 8d6169ec2406..1577754992fb 100644
+index b3264d122d3d..1577754992fb 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
@@ -17,13 +17,22 @@ CXXFLAGS += [
@@ -38841,7 +39027,7 @@ index 8d6169ec2406..1577754992fb 100644
FINAL_LIBRARY = "webrtc"
-@@ -54,137 +63,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,138 +63,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38911,6 +39097,7 @@ index 8d6169ec2406..1577754992fb 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -38983,7 +39170,7 @@ index 8d6169ec2406..1577754992fb 100644
Library("aec3_avx2_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
-index b0952a7d0cd8..8a9d53a1b709 100644
+index efeca7bd9fe3..8a9d53a1b709 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -39007,7 +39194,7 @@ index b0952a7d0cd8..8a9d53a1b709 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39068,6 +39255,7 @@ index b0952a7d0cd8..8a9d53a1b709 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -39112,7 +39300,7 @@ index b0952a7d0cd8..8a9d53a1b709 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -39172,7 +39360,7 @@ index b0952a7d0cd8..8a9d53a1b709 100644
-
Library("aec3_common_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
-index 97bbc435395f..0fba9b70c95b 100644
+index 7884ff5655eb..0fba9b70c95b 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -39196,7 +39384,7 @@ index 97bbc435395f..0fba9b70c95b 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39265,6 +39453,7 @@ index 97bbc435395f..0fba9b70c95b 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -39316,7 +39505,7 @@ index 97bbc435395f..0fba9b70c95b 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -161,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -39376,7 +39565,7 @@ index 97bbc435395f..0fba9b70c95b 100644
-
Library("aec3_fft_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
-index 6bc572f206ea..f4ed63e8bf46 100644
+index 941f61d2d060..f4ed63e8bf46 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
@@ -12,12 +12,21 @@ AllowCompilerWarnings()
@@ -39401,7 +39590,7 @@ index 6bc572f206ea..f4ed63e8bf46 100644
FINAL_LIBRARY = "webrtc"
-@@ -100,190 +109,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -100,191 +109,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39470,6 +39659,7 @@ index 6bc572f206ea..f4ed63e8bf46 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -39599,7 +39789,7 @@ index 6bc572f206ea..f4ed63e8bf46 100644
Library("aec3_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
-index d77163999ba8..bbfd52a05ced 100644
+index 21aea046cbc1..bbfd52a05ced 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -39623,7 +39813,7 @@ index d77163999ba8..bbfd52a05ced 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39688,6 +39878,7 @@ index d77163999ba8..bbfd52a05ced 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -39732,7 +39923,7 @@ index d77163999ba8..bbfd52a05ced 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -39792,7 +39983,7 @@ index d77163999ba8..bbfd52a05ced 100644
-
Library("fft_data_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
-index bae4fa297266..af83e29c22cb 100644
+index cad86a818768..af83e29c22cb 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -39816,7 +40007,7 @@ index bae4fa297266..af83e29c22cb 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39881,6 +40072,7 @@ index bae4fa297266..af83e29c22cb 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -39925,7 +40117,7 @@ index bae4fa297266..af83e29c22cb 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -39985,7 +40177,7 @@ index bae4fa297266..af83e29c22cb 100644
-
Library("matched_filter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
-index b7a10f5d7c88..8068d5e8b48a 100644
+index 257968fc0611..8068d5e8b48a 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -40009,7 +40201,7 @@ index b7a10f5d7c88..8068d5e8b48a 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40074,6 +40266,7 @@ index b7a10f5d7c88..8068d5e8b48a 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -40118,7 +40311,7 @@ index b7a10f5d7c88..8068d5e8b48a 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -40178,7 +40371,7 @@ index b7a10f5d7c88..8068d5e8b48a 100644
-
Library("render_buffer_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
-index 89ee0b6a8172..e2c6c18ff9e0 100644
+index fdcb81d98cb9..e2c6c18ff9e0 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -40202,7 +40395,7 @@ index 89ee0b6a8172..e2c6c18ff9e0 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40267,6 +40460,7 @@ index 89ee0b6a8172..e2c6c18ff9e0 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -40311,7 +40505,7 @@ index 89ee0b6a8172..e2c6c18ff9e0 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -40371,7 +40565,7 @@ index 89ee0b6a8172..e2c6c18ff9e0 100644
-
Library("vector_math_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
-index 201cd58360cf..28209dac0b7d 100644
+index 003b6457cdcb..28209dac0b7d 100644
--- third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -40395,7 +40589,7 @@ index 201cd58360cf..28209dac0b7d 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40460,6 +40654,7 @@ index 201cd58360cf..28209dac0b7d 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -40508,7 +40703,7 @@ index 201cd58360cf..28209dac0b7d 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -154,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -40568,7 +40763,7 @@ index 201cd58360cf..28209dac0b7d 100644
-
Library("aec_dump_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
-index 974b70b087d2..e7cd5f585b83 100644
+index 7c41104199e4..e7cd5f585b83 100644
--- third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -40592,7 +40787,7 @@ index 974b70b087d2..e7cd5f585b83 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40657,6 +40852,7 @@ index 974b70b087d2..e7cd5f585b83 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -40783,7 +40979,7 @@ index 974b70b087d2..e7cd5f585b83 100644
Library("null_aec_dump_factory_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
-index 1c47bbd5cc1e..c51fcb7d6a97 100644
+index 3e6e8171e9d6..c51fcb7d6a97 100644
--- third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -40807,7 +41003,7 @@ index 1c47bbd5cc1e..c51fcb7d6a97 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40872,6 +41068,7 @@ index 1c47bbd5cc1e..c51fcb7d6a97 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -40998,7 +41195,7 @@ index 1c47bbd5cc1e..c51fcb7d6a97 100644
Library("aec_dump_interface_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
-index f0e41cd6bd08..9fec01cfbcec 100644
+index 987403719789..9fec01cfbcec 100644
--- third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -41022,7 +41219,7 @@ index f0e41cd6bd08..9fec01cfbcec 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,113 +53,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,114 +53,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41103,6 +41300,7 @@ index f0e41cd6bd08..9fec01cfbcec 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -41137,7 +41335,7 @@ index f0e41cd6bd08..9fec01cfbcec 100644
if CONFIG["CPU_ARCH"] == "aarch64":
-@@ -158,20 +61,7 @@ if CONFIG["CPU_ARCH"] == "aarch64":
+@@ -159,20 +61,7 @@ if CONFIG["CPU_ARCH"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
SOURCES += [
@@ -41159,7 +41357,7 @@ index f0e41cd6bd08..9fec01cfbcec 100644
"/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_neon.cc"
]
-@@ -179,7 +69,6 @@ if CONFIG["CPU_ARCH"] == "mips32":
+@@ -180,7 +69,6 @@ if CONFIG["CPU_ARCH"] == "mips32":
DEFINES["MIPS32_LE"] = True
DEFINES["MIPS_FPU_LE"] = True
@@ -41167,7 +41365,7 @@ index f0e41cd6bd08..9fec01cfbcec 100644
SOURCES += [
"/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_mips.cc"
-@@ -187,8 +76,6 @@ if CONFIG["CPU_ARCH"] == "mips32":
+@@ -188,8 +76,6 @@ if CONFIG["CPU_ARCH"] == "mips32":
if CONFIG["CPU_ARCH"] == "mips64":
@@ -41176,7 +41374,7 @@ index f0e41cd6bd08..9fec01cfbcec 100644
SOURCES += [
"/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
]
-@@ -199,95 +86,28 @@ if CONFIG["CPU_ARCH"] == "ppc64":
+@@ -200,95 +86,28 @@ if CONFIG["CPU_ARCH"] == "ppc64":
"/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
]
@@ -41278,7 +41476,7 @@ index f0e41cd6bd08..9fec01cfbcec 100644
Library("aecm_core_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
-index 395386d9a4d2..fdcc87394fd4 100644
+index 98bf50c39e96..fdcc87394fd4 100644
--- third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
@@ -12,12 +12,21 @@ AllowCompilerWarnings()
@@ -41303,7 +41501,7 @@ index 395386d9a4d2..fdcc87394fd4 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41372,6 +41570,7 @@ index 395386d9a4d2..fdcc87394fd4 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -41501,7 +41700,7 @@ index 395386d9a4d2..fdcc87394fd4 100644
Library("agc_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
-index c6ab9b3160de..6cc48faee4a7 100644
+index 71e47161531c..6cc48faee4a7 100644
--- third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -41525,7 +41724,7 @@ index c6ab9b3160de..6cc48faee4a7 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41586,6 +41785,7 @@ index c6ab9b3160de..6cc48faee4a7 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -41630,7 +41830,7 @@ index c6ab9b3160de..6cc48faee4a7 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -41690,7 +41890,7 @@ index c6ab9b3160de..6cc48faee4a7 100644
-
Library("gain_control_interface_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
-index 0188a8ac107e..364ef9950f2c 100644
+index 53ca84fe865c..364ef9950f2c 100644
--- third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -41714,7 +41914,7 @@ index 0188a8ac107e..364ef9950f2c 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41783,6 +41983,7 @@ index 0188a8ac107e..364ef9950f2c 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -41912,7 +42113,7 @@ index 0188a8ac107e..364ef9950f2c 100644
Library("legacy_agc_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
-index 9db9a639e7ae..865eee21cf92 100644
+index ce184f633c68..865eee21cf92 100644
--- third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -41936,7 +42137,7 @@ index 9db9a639e7ae..865eee21cf92 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42005,6 +42206,7 @@ index 9db9a639e7ae..865eee21cf92 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -42134,7 +42336,7 @@ index 9db9a639e7ae..865eee21cf92 100644
Library("level_estimation_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build
-index b6913ed5bcac..d8235d61acec 100644
+index e12d0140a005..d8235d61acec 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build
@@ -12,12 +12,21 @@ AllowCompilerWarnings()
@@ -42159,7 +42361,7 @@ index b6913ed5bcac..d8235d61acec 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42228,6 +42430,7 @@ index b6913ed5bcac..d8235d61acec 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -42357,7 +42560,7 @@ index b6913ed5bcac..d8235d61acec 100644
Library("adaptive_digital_gain_controller_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
-index f396f42e5776..1d4e4aaebbe3 100644
+index 0b0a0b2c19a1..1d4e4aaebbe3 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -42381,7 +42584,7 @@ index f396f42e5776..1d4e4aaebbe3 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42446,6 +42649,7 @@ index f396f42e5776..1d4e4aaebbe3 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -42568,7 +42772,7 @@ index f396f42e5776..1d4e4aaebbe3 100644
Library("biquad_filter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build
-index 9cddd69abef4..fc59d2ead813 100644
+index 24809f2af822..fc59d2ead813 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -42592,7 +42796,7 @@ index 9cddd69abef4..fc59d2ead813 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42661,6 +42865,7 @@ index 9cddd69abef4..fc59d2ead813 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -42790,7 +42995,7 @@ index 9cddd69abef4..fc59d2ead813 100644
Library("clipping_predictor_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
-index 274cae23a398..c4e0b45cf302 100644
+index 06cd0cd8b986..c4e0b45cf302 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -42814,7 +43019,7 @@ index 274cae23a398..c4e0b45cf302 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42875,6 +43080,7 @@ index 274cae23a398..c4e0b45cf302 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -42919,7 +43125,7 @@ index 274cae23a398..c4e0b45cf302 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -42979,7 +43185,7 @@ index 274cae23a398..c4e0b45cf302 100644
-
Library("common_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build
-index a4572251ad4c..6817471d99c1 100644
+index f837c9d4c0f1..6817471d99c1 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -43003,7 +43209,7 @@ index a4572251ad4c..6817471d99c1 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43072,6 +43278,7 @@ index a4572251ad4c..6817471d99c1 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -43201,7 +43408,7 @@ index a4572251ad4c..6817471d99c1 100644
Library("cpu_features_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
-index c25b4d0e6e55..aa7b9fbe475c 100644
+index b58b5595104e..aa7b9fbe475c 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
@@ -12,12 +12,21 @@ AllowCompilerWarnings()
@@ -43226,7 +43433,7 @@ index c25b4d0e6e55..aa7b9fbe475c 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,191 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43295,6 +43502,7 @@ index c25b4d0e6e55..aa7b9fbe475c 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -43424,7 +43632,7 @@ index c25b4d0e6e55..aa7b9fbe475c 100644
Library("fixed_digital_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
-index 394aa109faf3..cb41c74ad271 100644
+index f16780d288ef..cb41c74ad271 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -43448,7 +43656,7 @@ index 394aa109faf3..cb41c74ad271 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43513,6 +43721,7 @@ index 394aa109faf3..cb41c74ad271 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -43635,7 +43844,7 @@ index 394aa109faf3..cb41c74ad271 100644
Library("gain_applier_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build
-index 5b1d68415a52..32bf484b86e7 100644
+index 767e386207c7..32bf484b86e7 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -43659,7 +43868,7 @@ index 5b1d68415a52..32bf484b86e7 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43720,6 +43929,7 @@ index 5b1d68415a52..32bf484b86e7 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -43764,7 +43974,7 @@ index 5b1d68415a52..32bf484b86e7 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -43824,7 +44034,7 @@ index 5b1d68415a52..32bf484b86e7 100644
-
Library("gain_map_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build
-index d88ac20d7cbf..451dc5c6c994 100644
+index 74604a6acbf1..451dc5c6c994 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build
@@ -12,12 +12,21 @@ AllowCompilerWarnings()
@@ -43849,7 +44059,7 @@ index d88ac20d7cbf..451dc5c6c994 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43918,6 +44128,7 @@ index d88ac20d7cbf..451dc5c6c994 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -44047,7 +44258,7 @@ index d88ac20d7cbf..451dc5c6c994 100644
Library("input_volume_controller_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build
-index 5a662f407985..c92be24aa407 100644
+index 3e808b4bc055..c92be24aa407 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -44071,7 +44282,7 @@ index 5a662f407985..c92be24aa407 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44136,6 +44347,7 @@ index 5a662f407985..c92be24aa407 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -44262,7 +44474,7 @@ index 5a662f407985..c92be24aa407 100644
Library("input_volume_stats_reporter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
-index 0c3f13c2220e..e4926bc41ed4 100644
+index 180fffdc4497..e4926bc41ed4 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
@@ -12,12 +12,21 @@ AllowCompilerWarnings()
@@ -44287,7 +44499,7 @@ index 0c3f13c2220e..e4926bc41ed4 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44356,6 +44568,7 @@ index 0c3f13c2220e..e4926bc41ed4 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -44485,7 +44698,7 @@ index 0c3f13c2220e..e4926bc41ed4 100644
Library("noise_level_estimator_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build
-index 3f00e43e7c28..87c64337304c 100644
+index 0991577d7318..87c64337304c 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -44509,7 +44722,7 @@ index 3f00e43e7c28..87c64337304c 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44578,6 +44791,7 @@ index 3f00e43e7c28..87c64337304c 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -44707,7 +44921,7 @@ index 3f00e43e7c28..87c64337304c 100644
Library("rnn_vad_auto_correlation_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build
-index 64d3371d81b0..bd147bc9f851 100644
+index 7aa475e6d79c..bd147bc9f851 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -44731,7 +44945,7 @@ index 64d3371d81b0..bd147bc9f851 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44800,6 +45014,7 @@ index 64d3371d81b0..bd147bc9f851 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -44851,7 +45066,7 @@ index 64d3371d81b0..bd147bc9f851 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -161,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -44911,7 +45126,7 @@ index 64d3371d81b0..bd147bc9f851 100644
-
Library("rnn_vad_common_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
-index 82e5302312e5..ef8d61998fa0 100644
+index b59fa2425449..ef8d61998fa0 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -44935,7 +45150,7 @@ index 82e5302312e5..ef8d61998fa0 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45004,6 +45219,7 @@ index 82e5302312e5..ef8d61998fa0 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -45133,7 +45349,7 @@ index 82e5302312e5..ef8d61998fa0 100644
Library("rnn_vad_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build
-index 7dd4619965ab..63049c23fc5e 100644
+index dbf41809ebab..63049c23fc5e 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -45157,7 +45373,7 @@ index 7dd4619965ab..63049c23fc5e 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45226,6 +45442,7 @@ index 7dd4619965ab..63049c23fc5e 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -45355,7 +45572,7 @@ index 7dd4619965ab..63049c23fc5e 100644
Library("rnn_vad_layers_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build
-index 1fcbbbe408fa..ebc5b9a10d04 100644
+index cc8c7fe209b7..ebc5b9a10d04 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -45379,7 +45596,7 @@ index 1fcbbbe408fa..ebc5b9a10d04 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45444,6 +45661,7 @@ index 1fcbbbe408fa..ebc5b9a10d04 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -45566,7 +45784,7 @@ index 1fcbbbe408fa..ebc5b9a10d04 100644
Library("rnn_vad_lp_residual_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build
-index 6a69de9e292e..3d0349fab510 100644
+index 2cd91c9827a0..3d0349fab510 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -45590,7 +45808,7 @@ index 6a69de9e292e..3d0349fab510 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45659,6 +45877,7 @@ index 6a69de9e292e..3d0349fab510 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -45788,7 +46007,7 @@ index 6a69de9e292e..3d0349fab510 100644
Library("rnn_vad_pitch_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build
-index d2a4eb7261b6..1a81378e66f5 100644
+index 65a132c3343c..1a81378e66f5 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -45812,7 +46031,7 @@ index d2a4eb7261b6..1a81378e66f5 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45877,6 +46096,7 @@ index d2a4eb7261b6..1a81378e66f5 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -45921,7 +46141,7 @@ index d2a4eb7261b6..1a81378e66f5 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -45981,7 +46201,7 @@ index d2a4eb7261b6..1a81378e66f5 100644
-
Library("rnn_vad_ring_buffer_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build
-index c6913470c362..916932ccba9a 100644
+index e87d61316604..916932ccba9a 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -46005,7 +46225,7 @@ index c6913470c362..916932ccba9a 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46070,6 +46290,7 @@ index c6913470c362..916932ccba9a 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -46114,7 +46335,7 @@ index c6913470c362..916932ccba9a 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -46174,7 +46395,7 @@ index c6913470c362..916932ccba9a 100644
-
Library("rnn_vad_sequence_buffer_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build
-index 8298c7e091d7..db6f13136c47 100644
+index 6b1a7cecb4b6..db6f13136c47 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -46198,7 +46419,7 @@ index 8298c7e091d7..db6f13136c47 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46267,6 +46488,7 @@ index 8298c7e091d7..db6f13136c47 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -46396,7 +46618,7 @@ index 8298c7e091d7..db6f13136c47 100644
Library("rnn_vad_spectral_features_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build
-index acb933045439..e9cb91b4da31 100644
+index fc9ecf452bbe..e9cb91b4da31 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -46420,7 +46642,7 @@ index acb933045439..e9cb91b4da31 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46485,6 +46707,7 @@ index acb933045439..e9cb91b4da31 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -46529,7 +46752,7 @@ index acb933045439..e9cb91b4da31 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -46589,7 +46812,7 @@ index acb933045439..e9cb91b4da31 100644
-
Library("rnn_vad_symmetric_matrix_buffer_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build
-index 275c512cf6bb..d8f9ba076c5f 100644
+index d8d5fdd2d7d0..d8f9ba076c5f 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build
@@ -17,12 +17,21 @@ CXXFLAGS += [
@@ -46614,7 +46837,7 @@ index 275c512cf6bb..d8f9ba076c5f 100644
FINAL_LIBRARY = "webrtc"
-@@ -49,137 +58,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,138 +58,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46684,6 +46907,7 @@ index 275c512cf6bb..d8f9ba076c5f 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -46756,7 +46980,7 @@ index 275c512cf6bb..d8f9ba076c5f 100644
Library("vector_math_avx2_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build
-index 263ec679e37d..e2c6c18ff9e0 100644
+index b901f045aafb..e2c6c18ff9e0 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -46780,7 +47004,7 @@ index 263ec679e37d..e2c6c18ff9e0 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46849,6 +47073,7 @@ index 263ec679e37d..e2c6c18ff9e0 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -46900,7 +47125,7 @@ index 263ec679e37d..e2c6c18ff9e0 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -161,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -46960,7 +47185,7 @@ index 263ec679e37d..e2c6c18ff9e0 100644
-
Library("vector_math_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build
-index b5fe38f226e1..25e1268d0588 100644
+index 57ace6dc36ca..25e1268d0588 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build
@@ -12,12 +12,21 @@ AllowCompilerWarnings()
@@ -46985,7 +47210,7 @@ index b5fe38f226e1..25e1268d0588 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47054,6 +47279,7 @@ index b5fe38f226e1..25e1268d0588 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -47183,7 +47409,7 @@ index b5fe38f226e1..25e1268d0588 100644
Library("saturation_protector_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build
-index aa4d6f2b9916..718d870cddd3 100644
+index 52e43c4ba419..718d870cddd3 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build
@@ -12,12 +12,21 @@ AllowCompilerWarnings()
@@ -47208,7 +47434,7 @@ index aa4d6f2b9916..718d870cddd3 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47277,6 +47503,7 @@ index aa4d6f2b9916..718d870cddd3 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -47406,7 +47633,7 @@ index aa4d6f2b9916..718d870cddd3 100644
Library("speech_level_estimator_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build
-index dfa276510899..9f02e46a59fd 100644
+index c52db67c0c55..9f02e46a59fd 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -47430,7 +47657,7 @@ index dfa276510899..9f02e46a59fd 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47499,6 +47726,7 @@ index dfa276510899..9f02e46a59fd 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -47628,7 +47856,7 @@ index dfa276510899..9f02e46a59fd 100644
Library("vad_wrapper_gn")
diff --git third_party/libwebrtc/modules/audio_processing/api_gn/moz.build third_party/libwebrtc/modules/audio_processing/api_gn/moz.build
-index 7f1c48ac391e..d6226679c01e 100644
+index e88194c51d8d..d6226679c01e 100644
--- third_party/libwebrtc/modules/audio_processing/api_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -47652,7 +47880,7 @@ index 7f1c48ac391e..d6226679c01e 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47717,6 +47945,7 @@ index 7f1c48ac391e..d6226679c01e 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -47843,7 +48072,7 @@ index 7f1c48ac391e..d6226679c01e 100644
Library("api_gn")
diff --git third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
-index ddec2cbc3e39..b138ee7f9eed 100644
+index e6cad40d45e0..b138ee7f9eed 100644
--- third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
@@ -12,12 +12,21 @@ AllowCompilerWarnings()
@@ -47868,7 +48097,7 @@ index ddec2cbc3e39..b138ee7f9eed 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47937,6 +48166,7 @@ index ddec2cbc3e39..b138ee7f9eed 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -48066,7 +48296,7 @@ index ddec2cbc3e39..b138ee7f9eed 100644
Library("apm_logging_gn")
diff --git third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
-index 328e0c7cfe07..d0921ac35100 100644
+index 8d57447ae8ee..d0921ac35100 100644
--- third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
@@ -12,12 +12,21 @@ AllowCompilerWarnings()
@@ -48091,7 +48321,7 @@ index 328e0c7cfe07..d0921ac35100 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,191 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48160,6 +48390,7 @@ index 328e0c7cfe07..d0921ac35100 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -48289,7 +48520,7 @@ index 328e0c7cfe07..d0921ac35100 100644
Library("audio_buffer_gn")
diff --git third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
-index 683d86e74389..d0b535438023 100644
+index 58380fe34bf3..d0b535438023 100644
--- third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -48313,7 +48544,7 @@ index 683d86e74389..d0b535438023 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48378,6 +48609,7 @@ index 683d86e74389..d0b535438023 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -48504,7 +48736,7 @@ index 683d86e74389..d0b535438023 100644
Library("audio_frame_proxies_gn")
diff --git third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
-index 9b90bca379fd..af0fce3d5e23 100644
+index ada921fa8de5..af0fce3d5e23 100644
--- third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -48528,7 +48760,7 @@ index 9b90bca379fd..af0fce3d5e23 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48593,6 +48825,7 @@ index 9b90bca379fd..af0fce3d5e23 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -48637,7 +48870,7 @@ index 9b90bca379fd..af0fce3d5e23 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -48697,7 +48930,7 @@ index 9b90bca379fd..af0fce3d5e23 100644
-
Library("audio_frame_view_gn")
diff --git third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
-index 028b486ee01e..906e240158f9 100644
+index 6c0d656ce523..906e240158f9 100644
--- third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
@@ -12,12 +12,21 @@ AllowCompilerWarnings()
@@ -48722,7 +48955,7 @@ index 028b486ee01e..906e240158f9 100644
FINAL_LIBRARY = "webrtc"
-@@ -50,190 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,191 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48791,6 +49024,7 @@ index 028b486ee01e..906e240158f9 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -48920,7 +49154,7 @@ index 028b486ee01e..906e240158f9 100644
Library("audio_processing_gn")
diff --git third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build
-index f0af20c33521..0e0173197c5f 100644
+index b329b9da4afa..0e0173197c5f 100644
--- third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -48944,7 +49178,7 @@ index f0af20c33521..0e0173197c5f 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,176 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49005,6 +49239,7 @@ index f0af20c33521..0e0173197c5f 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -49127,7 +49362,7 @@ index f0af20c33521..0e0173197c5f 100644
Library("audio_processing_statistics_gn")
diff --git third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build
-index 3e57c48b6fc4..3ceff91af48f 100644
+index 9059e855c828..3ceff91af48f 100644
--- third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -49151,7 +49386,7 @@ index 3e57c48b6fc4..3ceff91af48f 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49220,6 +49455,7 @@ index 3e57c48b6fc4..3ceff91af48f 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -49349,7 +49585,7 @@ index 3e57c48b6fc4..3ceff91af48f 100644
Library("capture_levels_adjuster_gn")
diff --git third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
-index 67e7fbc112a4..6abe5e1363e5 100644
+index 5b8f67accbaf..6abe5e1363e5 100644
--- third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
@@ -12,12 +12,21 @@ AllowCompilerWarnings()
@@ -49374,7 +49610,7 @@ index 67e7fbc112a4..6abe5e1363e5 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49443,6 +49679,7 @@ index 67e7fbc112a4..6abe5e1363e5 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -49572,7 +49809,7 @@ index 67e7fbc112a4..6abe5e1363e5 100644
Library("gain_controller2_gn")
diff --git third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
-index 4c8aac9c3dad..28352a6c74f4 100644
+index 2cb0bded2b77..28352a6c74f4 100644
--- third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -49596,7 +49833,7 @@ index 4c8aac9c3dad..28352a6c74f4 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49665,6 +49902,7 @@ index 4c8aac9c3dad..28352a6c74f4 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -49794,7 +50032,7 @@ index 4c8aac9c3dad..28352a6c74f4 100644
Library("high_pass_filter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
-index e1b1a395b708..7564f587464b 100644
+index 015428756672..7564f587464b 100644
--- third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
@@ -12,12 +12,21 @@ AllowCompilerWarnings()
@@ -49819,7 +50057,7 @@ index e1b1a395b708..7564f587464b 100644
FINAL_LIBRARY = "webrtc"
-@@ -56,190 +65,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -56,191 +65,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49888,6 +50126,7 @@ index e1b1a395b708..7564f587464b 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -50017,7 +50256,7 @@ index e1b1a395b708..7564f587464b 100644
Library("ns_gn")
diff --git third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build
-index 3e4fa4ca518f..3bd588630b7e 100644
+index da50a17adc2e..3bd588630b7e 100644
--- third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -50041,7 +50280,7 @@ index 3e4fa4ca518f..3bd588630b7e 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50110,6 +50349,7 @@ index 3e4fa4ca518f..3bd588630b7e 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -50239,7 +50479,7 @@ index 3e4fa4ca518f..3bd588630b7e 100644
Library("optionally_built_submodule_creators_gn")
diff --git third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
-index ec35734b6dfc..de1436046491 100644
+index b7826745233f..de1436046491 100644
--- third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -50263,7 +50503,7 @@ index ec35734b6dfc..de1436046491 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50328,6 +50568,7 @@ index ec35734b6dfc..de1436046491 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -50450,7 +50691,7 @@ index ec35734b6dfc..de1436046491 100644
Library("rms_level_gn")
diff --git third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build
-index 5988e89a6a2a..5b680cbdd1fb 100644
+index bd4d35d045b2..5b680cbdd1fb 100644
--- third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -50474,7 +50715,7 @@ index 5988e89a6a2a..5b680cbdd1fb 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50535,6 +50776,7 @@ index 5988e89a6a2a..5b680cbdd1fb 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -50579,7 +50821,7 @@ index 5988e89a6a2a..5b680cbdd1fb 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -50639,7 +50881,7 @@ index 5988e89a6a2a..5b680cbdd1fb 100644
-
Library("transient_suppressor_api_gn")
diff --git third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build
-index ee6b82a2f629..d7a2d68e8bf0 100644
+index 760ef49df8ca..d7a2d68e8bf0 100644
--- third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -50663,7 +50905,7 @@ index ee6b82a2f629..d7a2d68e8bf0 100644
FINAL_LIBRARY = "webrtc"
-@@ -47,190 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,191 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50732,6 +50974,7 @@ index ee6b82a2f629..d7a2d68e8bf0 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -50861,7 +51104,7 @@ index ee6b82a2f629..d7a2d68e8bf0 100644
Library("transient_suppressor_impl_gn")
diff --git third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build
-index e2abcb849006..6deaa3bbf6a4 100644
+index fe78982fccb4..6deaa3bbf6a4 100644
--- third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -50885,7 +51128,7 @@ index e2abcb849006..6deaa3bbf6a4 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50950,6 +51193,7 @@ index e2abcb849006..6deaa3bbf6a4 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -51072,7 +51316,7 @@ index e2abcb849006..6deaa3bbf6a4 100644
Library("voice_probability_delay_unit_gn")
diff --git third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
-index 8cf3aaefeb48..ae86ec0ff176 100644
+index fb26a58f0c21..ae86ec0ff176 100644
--- third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -51096,7 +51340,7 @@ index 8cf3aaefeb48..ae86ec0ff176 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51161,6 +51405,7 @@ index 8cf3aaefeb48..ae86ec0ff176 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -51283,7 +51528,7 @@ index 8cf3aaefeb48..ae86ec0ff176 100644
Library("cascaded_biquad_filter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
-index 11294e2aefb8..0d5e4b712c18 100644
+index 15acb8a20a1e..0d5e4b712c18 100644
--- third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -51307,7 +51552,7 @@ index 11294e2aefb8..0d5e4b712c18 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,180 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51372,6 +51617,7 @@ index 11294e2aefb8..0d5e4b712c18 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -51494,7 +51740,7 @@ index 11294e2aefb8..0d5e4b712c18 100644
Library("legacy_delay_estimator_gn")
diff --git third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
-index 02898359bf06..7d5ad6e0e09e 100644
+index ccc722407aee..7d5ad6e0e09e 100644
--- third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -51518,7 +51764,7 @@ index 02898359bf06..7d5ad6e0e09e 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51583,6 +51829,7 @@ index 02898359bf06..7d5ad6e0e09e 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -51705,7 +51952,7 @@ index 02898359bf06..7d5ad6e0e09e 100644
Library("pffft_wrapper_gn")
diff --git third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
-index 0e76427c6e5f..b452ab92154e 100644
+index 5f04593b2e61..b452ab92154e 100644
--- third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -51729,7 +51976,7 @@ index 0e76427c6e5f..b452ab92154e 100644
FINAL_LIBRARY = "webrtc"
-@@ -50,190 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,191 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51798,6 +52045,7 @@ index 0e76427c6e5f..b452ab92154e 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -51927,7 +52175,7 @@ index 0e76427c6e5f..b452ab92154e 100644
Library("vad_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
-index 700c1d15f44f..02587d185dd1 100644
+index 2e33abbeed55..02587d185dd1 100644
--- third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -51951,7 +52199,7 @@ index 700c1d15f44f..02587d185dd1 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,192 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52021,6 +52269,7 @@ index 700c1d15f44f..02587d185dd1 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -52150,7 +52399,7 @@ index 700c1d15f44f..02587d185dd1 100644
Library("congestion_controller_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
-index f6520bf35800..0b35f2f82c75 100644
+index e889e0aa39c2..0b35f2f82c75 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -52174,7 +52423,7 @@ index f6520bf35800..0b35f2f82c75 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52239,6 +52488,7 @@ index f6520bf35800..0b35f2f82c75 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -52365,7 +52615,7 @@ index f6520bf35800..0b35f2f82c75 100644
Library("alr_detector_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
-index 35ba379f71c0..ff1a426bf5d3 100644
+index 0eb57708337c..ff1a426bf5d3 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -52389,7 +52639,7 @@ index 35ba379f71c0..ff1a426bf5d3 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,192 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52459,6 +52709,7 @@ index 35ba379f71c0..ff1a426bf5d3 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -52588,7 +52839,7 @@ index 35ba379f71c0..ff1a426bf5d3 100644
Library("delay_based_bwe_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
-index b15062af41c8..3e8439f74637 100644
+index ba9bed4906f6..3e8439f74637 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -52612,7 +52863,7 @@ index b15062af41c8..3e8439f74637 100644
FINAL_LIBRARY = "webrtc"
-@@ -49,190 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,191 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52681,6 +52932,7 @@ index b15062af41c8..3e8439f74637 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -52810,7 +53062,7 @@ index b15062af41c8..3e8439f74637 100644
Library("estimators_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
-index de5ccaa0c810..49adaa09b004 100644
+index 43b2f6e7df5e..49adaa09b004 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -52834,7 +53086,7 @@ index de5ccaa0c810..49adaa09b004 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,192 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52904,6 +53156,7 @@ index de5ccaa0c810..49adaa09b004 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -53033,7 +53286,7 @@ index de5ccaa0c810..49adaa09b004 100644
Library("goog_cc_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
-index 829ff47d87db..3f777466098c 100644
+index 0d6561d92a2c..3f777466098c 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -53057,7 +53310,7 @@ index 829ff47d87db..3f777466098c 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53122,6 +53375,7 @@ index 829ff47d87db..3f777466098c 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -53244,7 +53498,7 @@ index 829ff47d87db..3f777466098c 100644
Library("link_capacity_estimator_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build
-index aae4b8252060..0cad7d4a534c 100644
+index cbc5a4acac4d..0cad7d4a534c 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build
@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -53268,7 +53522,7 @@ index aae4b8252060..0cad7d4a534c 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,184 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53333,6 +53587,7 @@ index aae4b8252060..0cad7d4a534c 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -53459,7 +53714,7 @@ index aae4b8252060..0cad7d4a534c 100644
Library("loss_based_bwe_v1_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build
-index 5728e0c4b27d..da1bee07288c 100644
+index 7ddc61f52b5d..da1bee07288c 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -53483,7 +53738,7 @@ index 5728e0c4b27d..da1bee07288c 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53552,6 +53807,7 @@ index 5728e0c4b27d..da1bee07288c 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -53681,7 +53937,7 @@ index 5728e0c4b27d..da1bee07288c 100644
Library("loss_based_bwe_v2_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
-index 4f4f573cd902..51646a517e70 100644
+index 12f16357dc0a..51646a517e70 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -53705,7 +53961,7 @@ index 4f4f573cd902..51646a517e70 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53770,6 +54026,7 @@ index 4f4f573cd902..51646a517e70 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -53896,7 +54153,7 @@ index 4f4f573cd902..51646a517e70 100644
Library("probe_controller_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
-index e189363d3ea8..5cf159041ae8 100644
+index a7da1d6e698b..5cf159041ae8 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -53920,7 +54177,7 @@ index e189363d3ea8..5cf159041ae8 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53985,6 +54242,7 @@ index e189363d3ea8..5cf159041ae8 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -54111,7 +54369,7 @@ index e189363d3ea8..5cf159041ae8 100644
Library("pushback_controller_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build
-index c93e412e836f..0b6eb6ed39e9 100644
+index 561eea363fc8..0b6eb6ed39e9 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build
@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -54135,7 +54393,7 @@ index c93e412e836f..0b6eb6ed39e9 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54204,6 +54462,7 @@ index c93e412e836f..0b6eb6ed39e9 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -54333,7 +54592,7 @@ index c93e412e836f..0b6eb6ed39e9 100644
Library("send_side_bwe_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
-index 980bc79d04c3..313ac07d0c15 100644
+index 1b79cc97eaf9..313ac07d0c15 100644
--- third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -54357,7 +54616,7 @@ index 980bc79d04c3..313ac07d0c15 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,192 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54427,6 +54686,7 @@ index 980bc79d04c3..313ac07d0c15 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -54556,7 +54816,7 @@ index 980bc79d04c3..313ac07d0c15 100644
Library("control_handler_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
-index eb5a2a87e058..b4e083731eed 100644
+index 9be9dcb027af..b4e083731eed 100644
--- third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -54580,7 +54840,7 @@ index eb5a2a87e058..b4e083731eed 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54649,6 +54909,7 @@ index eb5a2a87e058..b4e083731eed 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -54778,7 +55039,7 @@ index eb5a2a87e058..b4e083731eed 100644
Library("transport_feedback_gn")
diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
-index 06e178901e14..8c38587543bd 100644
+index 66792f98e923..8c38587543bd 100644
--- third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
+++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
@@ -12,12 +12,21 @@ AllowCompilerWarnings()
@@ -54803,7 +55064,7 @@ index 06e178901e14..8c38587543bd 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,110 +53,23 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,111 +53,23 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54864,6 +55125,7 @@ index 06e178901e14..8c38587543bd 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -54920,7 +55182,7 @@ index 06e178901e14..8c38587543bd 100644
-
Library("desktop_capture_differ_sse2_gn")
diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
-index 63c0e0b52d57..77ef9f7209ee 100644
+index 99fd3c74c735..77ef9f7209ee 100644
--- third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
+++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
@@ -14,11 +14,20 @@ AllowCompilerWarnings()
@@ -54944,7 +55206,7 @@ index 63c0e0b52d57..77ef9f7209ee 100644
FINAL_LIBRARY = "webrtc"
-@@ -70,180 +79,13 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -70,186 +79,13 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55042,6 +55304,7 @@ index 63c0e0b52d57..77ef9f7209ee 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -55065,6 +55328,7 @@ index 63c0e0b52d57..77ef9f7209ee 100644
- OS_LIBS += [
- "crypt32",
- "d3d11",
+- "dwmapi",
- "dxgi",
- "iphlpapi",
- "secur32",
@@ -55100,6 +55364,10 @@ index 63c0e0b52d57..77ef9f7209ee 100644
- "/third_party/libwebrtc/modules/desktop_capture/win/screen_capturer_win_directx.cc",
- "/third_party/libwebrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc",
- "/third_party/libwebrtc/modules/desktop_capture/win/selected_window_context.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_source.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/win/wgc_desktop_frame.cc",
- "/third_party/libwebrtc/modules/desktop_capture/win/window_capture_utils.cc",
- "/third_party/libwebrtc/modules/desktop_capture/win/window_capturer_win_gdi.cc",
- "/third_party/libwebrtc/modules/desktop_capture/window_capturer_win.cc",
@@ -55126,7 +55394,7 @@ index 63c0e0b52d57..77ef9f7209ee 100644
LOCAL_INCLUDES += [
"/gfx/angle/checkout/include/",
-@@ -256,7 +98,8 @@ if CONFIG["CPU_ARCH"] == "arm":
+@@ -262,7 +98,8 @@ if CONFIG["CPU_ARCH"] == "arm":
]
SOURCES += [
@@ -55136,7 +55404,7 @@ index 63c0e0b52d57..77ef9f7209ee 100644
]
UNIFIED_SOURCES += [
-@@ -266,7 +109,9 @@ if CONFIG["CPU_ARCH"] == "arm":
+@@ -272,7 +109,9 @@ if CONFIG["CPU_ARCH"] == "arm":
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
@@ -55147,7 +55415,7 @@ index 63c0e0b52d57..77ef9f7209ee 100644
]
if CONFIG["CPU_ARCH"] == "mips32":
-@@ -274,7 +119,6 @@ if CONFIG["CPU_ARCH"] == "mips32":
+@@ -280,7 +119,6 @@ if CONFIG["CPU_ARCH"] == "mips32":
DEFINES["MIPS32_LE"] = True
DEFINES["MIPS_FPU_LE"] = True
DEFINES["WEBRTC_USE_PIPEWIRE"] = True
@@ -55155,7 +55423,7 @@ index 63c0e0b52d57..77ef9f7209ee 100644
LOCAL_INCLUDES += [
"/gfx/angle/checkout/include/",
-@@ -287,7 +131,8 @@ if CONFIG["CPU_ARCH"] == "mips32":
+@@ -293,7 +131,8 @@ if CONFIG["CPU_ARCH"] == "mips32":
]
SOURCES += [
@@ -55165,7 +55433,7 @@ index 63c0e0b52d57..77ef9f7209ee 100644
]
UNIFIED_SOURCES += [
-@@ -297,13 +142,14 @@ if CONFIG["CPU_ARCH"] == "mips32":
+@@ -303,13 +142,14 @@ if CONFIG["CPU_ARCH"] == "mips32":
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
@@ -55182,7 +55450,7 @@ index 63c0e0b52d57..77ef9f7209ee 100644
LOCAL_INCLUDES += [
"/gfx/angle/checkout/include/",
-@@ -316,7 +162,8 @@ if CONFIG["CPU_ARCH"] == "mips64":
+@@ -322,7 +162,8 @@ if CONFIG["CPU_ARCH"] == "mips64":
]
SOURCES += [
@@ -55192,7 +55460,7 @@ index 63c0e0b52d57..77ef9f7209ee 100644
]
UNIFIED_SOURCES += [
-@@ -326,128 +173,19 @@ if CONFIG["CPU_ARCH"] == "mips64":
+@@ -332,128 +173,19 @@ if CONFIG["CPU_ARCH"] == "mips64":
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
@@ -55325,7 +55593,7 @@ index 63c0e0b52d57..77ef9f7209ee 100644
LOCAL_INCLUDES += [
"/gfx/angle/checkout/include/",
-@@ -460,7 +198,8 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+@@ -466,7 +198,8 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
]
SOURCES += [
@@ -55335,7 +55603,7 @@ index 63c0e0b52d57..77ef9f7209ee 100644
]
UNIFIED_SOURCES += [
-@@ -470,13 +209,15 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+@@ -476,13 +209,15 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
@@ -55354,7 +55622,7 @@ index 63c0e0b52d57..77ef9f7209ee 100644
LOCAL_INCLUDES += [
"/gfx/angle/checkout/include/",
-@@ -489,7 +230,8 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+@@ -495,7 +230,8 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
]
SOURCES += [
@@ -55364,7 +55632,7 @@ index 63c0e0b52d57..77ef9f7209ee 100644
]
UNIFIED_SOURCES += [
-@@ -499,97 +241,12 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+@@ -505,97 +241,12 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
@@ -55466,7 +55734,7 @@ index 63c0e0b52d57..77ef9f7209ee 100644
DEFINES["USE_X11"] = "1"
DEFINES["WEBRTC_USE_X11"] = True
-@@ -618,62 +275,23 @@ if CONFIG["CPU_ARCH"] == "mips64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TA
+@@ -624,62 +275,23 @@ if CONFIG["CPU_ARCH"] == "mips64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TA
"/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc"
]
@@ -55622,7 +55890,7 @@ index 2706bed4a65f..000000000000
-
-Library("desktop_capture_objc_gn")
diff --git third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
-index 59c2ba037b83..4458ad4e5673 100644
+index 8edb2c234487..4458ad4e5673 100644
--- third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
+++ third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -55646,7 +55914,7 @@ index 59c2ba037b83..4458ad4e5673 100644
FINAL_LIBRARY = "webrtc"
-@@ -49,165 +58,31 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,166 +58,31 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55694,6 +55962,7 @@ index 59c2ba037b83..4458ad4e5673 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -55818,7 +56087,7 @@ index 59c2ba037b83..4458ad4e5673 100644
DEFINES["USE_X11"] = "1"
diff --git third_party/libwebrtc/modules/module_api_gn/moz.build third_party/libwebrtc/modules/module_api_gn/moz.build
-index 3b999fdfdfe9..b5cd5bd51eb9 100644
+index adf140609414..b5cd5bd51eb9 100644
--- third_party/libwebrtc/modules/module_api_gn/moz.build
+++ third_party/libwebrtc/modules/module_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -55842,7 +56111,7 @@ index 3b999fdfdfe9..b5cd5bd51eb9 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55903,6 +56172,7 @@ index 3b999fdfdfe9..b5cd5bd51eb9 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -55947,7 +56217,7 @@ index 3b999fdfdfe9..b5cd5bd51eb9 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -56007,7 +56277,7 @@ index 3b999fdfdfe9..b5cd5bd51eb9 100644
-
Library("module_api_gn")
diff --git third_party/libwebrtc/modules/module_api_public_gn/moz.build third_party/libwebrtc/modules/module_api_public_gn/moz.build
-index 6d3952410c70..6d2484302b75 100644
+index 519b39d7c9ad..6d2484302b75 100644
--- third_party/libwebrtc/modules/module_api_public_gn/moz.build
+++ third_party/libwebrtc/modules/module_api_public_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -56031,7 +56301,7 @@ index 6d3952410c70..6d2484302b75 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56092,6 +56362,7 @@ index 6d3952410c70..6d2484302b75 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -56136,7 +56407,7 @@ index 6d3952410c70..6d2484302b75 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -56196,7 +56467,7 @@ index 6d3952410c70..6d2484302b75 100644
-
Library("module_api_public_gn")
diff --git third_party/libwebrtc/modules/module_fec_api_gn/moz.build third_party/libwebrtc/modules/module_fec_api_gn/moz.build
-index 3badc9ded12e..b50fec7f7d98 100644
+index e90f9b385b90..b50fec7f7d98 100644
--- third_party/libwebrtc/modules/module_fec_api_gn/moz.build
+++ third_party/libwebrtc/modules/module_fec_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -56220,7 +56491,7 @@ index 3badc9ded12e..b50fec7f7d98 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56281,6 +56552,7 @@ index 3badc9ded12e..b50fec7f7d98 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -56325,7 +56597,7 @@ index 3badc9ded12e..b50fec7f7d98 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -56385,7 +56657,7 @@ index 3badc9ded12e..b50fec7f7d98 100644
-
Library("module_fec_api_gn")
diff --git third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
-index 17d4371d72e0..f42d208ca469 100644
+index 8a598b20fcd7..f42d208ca469 100644
--- third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
+++ third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -56409,7 +56681,7 @@ index 17d4371d72e0..f42d208ca469 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56474,6 +56746,7 @@ index 17d4371d72e0..f42d208ca469 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -56596,7 +56869,7 @@ index 17d4371d72e0..f42d208ca469 100644
Library("interval_budget_gn")
diff --git third_party/libwebrtc/modules/pacing/pacing_gn/moz.build third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
-index 6fb893c2db14..5605df303cd7 100644
+index 28ca1bdfb44c..5605df303cd7 100644
--- third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
+++ third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -56620,7 +56893,7 @@ index 6fb893c2db14..5605df303cd7 100644
FINAL_LIBRARY = "webrtc"
-@@ -50,191 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,192 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56690,6 +56963,7 @@ index 6fb893c2db14..5605df303cd7 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -56872,7 +57146,7 @@ index 77603c780bdc..2ab84b3fe759 100644
DEFINES["USE_X11"] = "1"
diff --git third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
-index e572e90c311a..712c9fe0bacd 100644
+index 42996ab39ade..712c9fe0bacd 100644
--- third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
+++ third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -56896,7 +57170,7 @@ index e572e90c311a..712c9fe0bacd 100644
FINAL_LIBRARY = "webrtc"
-@@ -55,190 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -55,191 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56965,6 +57239,7 @@ index e572e90c311a..712c9fe0bacd 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -57094,7 +57369,7 @@ index e572e90c311a..712c9fe0bacd 100644
Library("remote_bitrate_estimator_gn")
diff --git third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
-index f03986e482da..8cfbc6b1ddb3 100644
+index 09f81dcf27da..8cfbc6b1ddb3 100644
--- third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
+++ third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -57118,7 +57393,7 @@ index f03986e482da..8cfbc6b1ddb3 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,176 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57179,6 +57454,7 @@ index f03986e482da..8cfbc6b1ddb3 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -57301,7 +57577,7 @@ index f03986e482da..8cfbc6b1ddb3 100644
Library("leb128_gn")
diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build
-index da69b456d323..3a86740343d2 100644
+index 2e9df3733b6f..3a86740343d2 100644
--- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build
+++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -57325,7 +57601,7 @@ index da69b456d323..3a86740343d2 100644
FINAL_LIBRARY = "webrtc"
-@@ -85,190 +94,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -85,191 +94,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57394,6 +57670,7 @@ index da69b456d323..3a86740343d2 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -57523,7 +57800,7 @@ index da69b456d323..3a86740343d2 100644
Library("rtp_rtcp_format_gn")
diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
-index d4d42e4dcf5c..ca2824350d12 100644
+index 3fca8bb86bb7..8a547c92b18c 100644
--- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
+++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -57547,7 +57824,7 @@ index d4d42e4dcf5c..ca2824350d12 100644
FINAL_LIBRARY = "webrtc"
-@@ -97,191 +106,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -98,192 +107,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57617,6 +57894,7 @@ index d4d42e4dcf5c..ca2824350d12 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -57746,7 +58024,7 @@ index d4d42e4dcf5c..ca2824350d12 100644
Library("rtp_rtcp_gn")
diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
-index 99447dd14992..4743dce9a666 100644
+index 02b919fc1648..4743dce9a666 100644
--- third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
+++ third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -57770,7 +58048,7 @@ index 99447dd14992..4743dce9a666 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57835,6 +58113,7 @@ index 99447dd14992..4743dce9a666 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -57961,7 +58240,7 @@ index 99447dd14992..4743dce9a666 100644
Library("rtp_video_header_gn")
diff --git third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
-index 40022820400d..a8dff360398f 100644
+index 2ea2bc54845b..a8dff360398f 100644
--- third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
+++ third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -57985,7 +58264,7 @@ index 40022820400d..a8dff360398f 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,176 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58046,6 +58325,7 @@ index 40022820400d..a8dff360398f 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -58168,7 +58448,7 @@ index 40022820400d..a8dff360398f 100644
Library("fft_gn")
diff --git third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
-index 3b2ee5ee3d97..af84f0dd5f5a 100644
+index 2dfeb265d510..af84f0dd5f5a 100644
--- third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
+++ third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -58192,7 +58472,7 @@ index 3b2ee5ee3d97..af84f0dd5f5a 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,176 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58253,6 +58533,7 @@ index 3b2ee5ee3d97..af84f0dd5f5a 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -58375,7 +58656,7 @@ index 3b2ee5ee3d97..af84f0dd5f5a 100644
Library("g711_3p_gn")
diff --git third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
-index f40abbac1407..d320b4ef86f8 100644
+index 7eb2371bd302..d320b4ef86f8 100644
--- third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
+++ third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -58399,7 +58680,7 @@ index f40abbac1407..d320b4ef86f8 100644
FINAL_LIBRARY = "webrtc"
-@@ -47,175 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,176 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58460,6 +58741,7 @@ index f40abbac1407..d320b4ef86f8 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -58582,7 +58864,7 @@ index f40abbac1407..d320b4ef86f8 100644
Library("g722_3p_gn")
diff --git third_party/libwebrtc/modules/utility/utility_gn/moz.build third_party/libwebrtc/modules/utility/utility_gn/moz.build
-index 8e60046c3417..e6d9cc9715bf 100644
+index ddb134b01e09..e6d9cc9715bf 100644
--- third_party/libwebrtc/modules/utility/utility_gn/moz.build
+++ third_party/libwebrtc/modules/utility/utility_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -58606,7 +58888,7 @@ index 8e60046c3417..e6d9cc9715bf 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58675,6 +58957,7 @@ index 8e60046c3417..e6d9cc9715bf 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -58719,7 +59002,7 @@ index 8e60046c3417..e6d9cc9715bf 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -153,65 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -154,65 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -58787,7 +59070,7 @@ index 8e60046c3417..e6d9cc9715bf 100644
-
Library("utility_gn")
diff --git third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
-index 4b4b418c551f..6daff73f66b4 100644
+index 18f193abd036..6daff73f66b4 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
@@ -14,11 +14,20 @@ AllowCompilerWarnings()
@@ -58822,7 +59105,7 @@ index 4b4b418c551f..6daff73f66b4 100644
"/third_party/libwebrtc/modules/video_capture/video_capture_options.cc"
]
-@@ -45,149 +58,13 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,150 +58,13 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58906,6 +59189,7 @@ index 4b4b418c551f..6daff73f66b4 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -58973,7 +59257,7 @@ index 4b4b418c551f..6daff73f66b4 100644
LOCAL_INCLUDES += [
"/gfx/angle/checkout/include/",
-@@ -206,81 +83,11 @@ if CONFIG["CPU_ARCH"] == "mips32":
+@@ -207,81 +83,11 @@ if CONFIG["CPU_ARCH"] == "mips32":
"/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
]
@@ -59058,7 +59342,7 @@ index 4b4b418c551f..6daff73f66b4 100644
LOCAL_INCLUDES += [
"/gfx/angle/checkout/include/",
-@@ -299,10 +106,9 @@ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+@@ -300,10 +106,9 @@ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
"/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
]
@@ -59070,7 +59354,7 @@ index 4b4b418c551f..6daff73f66b4 100644
LOCAL_INCLUDES += [
"/gfx/angle/checkout/include/",
-@@ -321,14 +127,14 @@ if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
+@@ -322,14 +127,14 @@ if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
"/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
]
@@ -59087,7 +59371,7 @@ index 4b4b418c551f..6daff73f66b4 100644
LOCAL_INCLUDES += [
"/gfx/angle/checkout/include/",
-@@ -347,10 +153,10 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+@@ -348,10 +153,10 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
"/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
]
@@ -59100,7 +59384,7 @@ index 4b4b418c551f..6daff73f66b4 100644
LOCAL_INCLUDES += [
"/gfx/angle/checkout/include/",
-@@ -369,4 +175,8 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+@@ -370,4 +175,8 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
"/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
]
@@ -59110,7 +59394,7 @@ index 4b4b418c551f..6daff73f66b4 100644
+
Library("video_capture_internal_impl_gn")
diff --git third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build
-index 8aa245b127c1..1f157fe113a0 100644
+index 521c96db23a0..1f157fe113a0 100644
--- third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build
+++ third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -59134,7 +59418,7 @@ index 8aa245b127c1..1f157fe113a0 100644
FINAL_LIBRARY = "webrtc"
-@@ -47,191 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,192 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59204,6 +59488,7 @@ index 8aa245b127c1..1f157fe113a0 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -59333,7 +59618,7 @@ index 8aa245b127c1..1f157fe113a0 100644
Library("video_capture_module_gn")
diff --git third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
-index 9020f11067fc..fcc8a73423ab 100644
+index 7162249695f9..fcc8a73423ab 100644
--- third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -59357,7 +59642,7 @@ index 9020f11067fc..fcc8a73423ab 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59422,6 +59707,7 @@ index 9020f11067fc..fcc8a73423ab 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -59548,7 +59834,7 @@ index 9020f11067fc..fcc8a73423ab 100644
Library("chain_diff_calculator_gn")
diff --git third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
-index 7c87e340afde..b4f0490937ff 100644
+index 762ae476513c..b4f0490937ff 100644
--- third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -59572,7 +59858,7 @@ index 7c87e340afde..b4f0490937ff 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59637,6 +59923,7 @@ index 7c87e340afde..b4f0490937ff 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -59681,7 +59968,7 @@ index 7c87e340afde..b4f0490937ff 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -59741,7 +60028,7 @@ index 7c87e340afde..b4f0490937ff 100644
-
Library("codec_globals_headers_gn")
diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
-index cc297017e3d5..12901738a75f 100644
+index 08853e440baf..12901738a75f 100644
--- third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -59765,7 +60052,7 @@ index cc297017e3d5..12901738a75f 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59830,6 +60117,7 @@ index cc297017e3d5..12901738a75f 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -59956,7 +60244,7 @@ index cc297017e3d5..12901738a75f 100644
Library("av1_svc_config_gn")
diff --git third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
-index 159b77d10cab..217d265bacee 100644
+index 93df73b440c0..217d265bacee 100644
--- third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -59980,7 +60268,7 @@ index 159b77d10cab..217d265bacee 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60049,6 +60337,7 @@ index 159b77d10cab..217d265bacee 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -60178,7 +60467,7 @@ index 159b77d10cab..217d265bacee 100644
Library("encoded_frame_gn")
diff --git third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
-index c518044c948a..74af6c5dc520 100644
+index 4b3ab25d4f74..74af6c5dc520 100644
--- third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -60202,7 +60491,7 @@ index c518044c948a..74af6c5dc520 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60267,6 +60556,7 @@ index c518044c948a..74af6c5dc520 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -60393,7 +60683,7 @@ index c518044c948a..74af6c5dc520 100644
Library("frame_dependencies_calculator_gn")
diff --git third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
-index d6342c48f713..544a97f60aad 100644
+index f811d36c257f..544a97f60aad 100644
--- third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -60417,7 +60707,7 @@ index d6342c48f713..544a97f60aad 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60486,6 +60776,7 @@ index d6342c48f713..544a97f60aad 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -60615,7 +60906,7 @@ index d6342c48f713..544a97f60aad 100644
Library("frame_helpers_gn")
diff --git third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
-index 33e763a48d7e..e1db6e2439d5 100644
+index 24af8bc27f5a..e1db6e2439d5 100644
--- third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -60639,7 +60930,7 @@ index 33e763a48d7e..e1db6e2439d5 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60708,6 +60999,7 @@ index 33e763a48d7e..e1db6e2439d5 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -60837,7 +61129,7 @@ index 33e763a48d7e..e1db6e2439d5 100644
Library("nack_requester_gn")
diff --git third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
-index 9561cb88e8eb..65e5b4757c29 100644
+index c251ed8dc84f..65e5b4757c29 100644
--- third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -60861,7 +61153,7 @@ index 9561cb88e8eb..65e5b4757c29 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60930,6 +61222,7 @@ index 9561cb88e8eb..65e5b4757c29 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -61059,7 +61352,7 @@ index 9561cb88e8eb..65e5b4757c29 100644
Library("packet_buffer_gn")
diff --git third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
-index f786b1161681..e6d655af95dc 100644
+index e7cdba8af34c..e6d655af95dc 100644
--- third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -61083,7 +61376,7 @@ index f786b1161681..e6d655af95dc 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61148,6 +61441,7 @@ index f786b1161681..e6d655af95dc 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -61274,7 +61568,7 @@ index f786b1161681..e6d655af95dc 100644
Library("scalability_mode_util_gn")
diff --git third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
-index a3e45b1cd7ba..12c34079a6e6 100644
+index dc072aba46a2..12c34079a6e6 100644
--- third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -61298,7 +61592,7 @@ index a3e45b1cd7ba..12c34079a6e6 100644
FINAL_LIBRARY = "webrtc"
-@@ -50,183 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,184 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61363,6 +61657,7 @@ index a3e45b1cd7ba..12c34079a6e6 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -61489,7 +61784,7 @@ index a3e45b1cd7ba..12c34079a6e6 100644
Library("scalability_structures_gn")
diff --git third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build
-index 42b8307362fe..9348473d2af9 100644
+index 887db86beb1a..9348473d2af9 100644
--- third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -61513,7 +61808,7 @@ index 42b8307362fe..9348473d2af9 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61578,6 +61873,7 @@ index 42b8307362fe..9348473d2af9 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -61700,7 +61996,7 @@ index 42b8307362fe..9348473d2af9 100644
Library("scalable_video_controller_gn")
diff --git third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
-index 5d7d952a69b9..7157f0bd74ba 100644
+index 0099063164b3..7157f0bd74ba 100644
--- third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -61724,7 +62020,7 @@ index 5d7d952a69b9..7157f0bd74ba 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61789,6 +62085,7 @@ index 5d7d952a69b9..7157f0bd74ba 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -61915,7 +62212,7 @@ index 5d7d952a69b9..7157f0bd74ba 100644
Library("svc_rate_allocator_gn")
diff --git third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build
-index 86a34e861ec4..1e4f00d3f730 100644
+index 18e3c54f37d6..1e4f00d3f730 100644
--- third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -61939,7 +62236,7 @@ index 86a34e861ec4..1e4f00d3f730 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62004,6 +62301,7 @@ index 86a34e861ec4..1e4f00d3f730 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -62126,7 +62424,7 @@ index 86a34e861ec4..1e4f00d3f730 100644
Library("decode_time_percentile_filter_gn")
diff --git third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build
-index ecdcfc93e128..47bc48987a96 100644
+index 101017561e0a..47bc48987a96 100644
--- third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -62150,7 +62448,7 @@ index ecdcfc93e128..47bc48987a96 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62215,6 +62513,7 @@ index ecdcfc93e128..47bc48987a96 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -62337,7 +62636,7 @@ index ecdcfc93e128..47bc48987a96 100644
Library("frame_delay_variation_kalman_filter_gn")
diff --git third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build
-index 56b01f3f41eb..a451183c0b23 100644
+index a5eb6b71fb36..a451183c0b23 100644
--- third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -62361,7 +62660,7 @@ index 56b01f3f41eb..a451183c0b23 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62426,6 +62725,7 @@ index 56b01f3f41eb..a451183c0b23 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -62548,7 +62848,7 @@ index 56b01f3f41eb..a451183c0b23 100644
Library("inter_frame_delay_variation_calculator_gn")
diff --git third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build
-index a0d6154d785f..b158655cdd5d 100644
+index 4f73f8844868..b158655cdd5d 100644
--- third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -62572,7 +62872,7 @@ index a0d6154d785f..b158655cdd5d 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62641,6 +62941,7 @@ index a0d6154d785f..b158655cdd5d 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -62770,7 +63071,7 @@ index a0d6154d785f..b158655cdd5d 100644
Library("jitter_estimator_gn")
diff --git third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build
-index 488a49d9c26b..bc1e328ba2ec 100644
+index 66e6e7a486ff..bc1e328ba2ec 100644
--- third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -62794,7 +63095,7 @@ index 488a49d9c26b..bc1e328ba2ec 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62859,6 +63160,7 @@ index 488a49d9c26b..bc1e328ba2ec 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -62981,7 +63283,7 @@ index 488a49d9c26b..bc1e328ba2ec 100644
Library("rtt_filter_gn")
diff --git third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build
-index 4cd085dd0962..2865a2290f7d 100644
+index bdc7bf3dcd5b..2865a2290f7d 100644
--- third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -63005,7 +63307,7 @@ index 4cd085dd0962..2865a2290f7d 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63070,6 +63372,7 @@ index 4cd085dd0962..2865a2290f7d 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -63192,7 +63495,7 @@ index 4cd085dd0962..2865a2290f7d 100644
Library("timestamp_extrapolator_gn")
diff --git third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build
-index 8ab43fb7484d..4fd77d42f049 100644
+index dd0e7c007a78..4fd77d42f049 100644
--- third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -63216,7 +63519,7 @@ index 8ab43fb7484d..4fd77d42f049 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63285,6 +63588,7 @@ index 8ab43fb7484d..4fd77d42f049 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -63414,7 +63718,7 @@ index 8ab43fb7484d..4fd77d42f049 100644
Library("timing_module_gn")
diff --git third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
-index f01783ebd1f3..89deb11da94a 100644
+index 8fd8cbe26304..89deb11da94a 100644
--- third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -63438,7 +63742,7 @@ index f01783ebd1f3..89deb11da94a 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,184 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63503,6 +63807,7 @@ index f01783ebd1f3..89deb11da94a 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -63629,7 +63934,7 @@ index f01783ebd1f3..89deb11da94a 100644
Library("video_codec_interface_gn")
diff --git third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
-index 3c92397fe562..197ccefb29d9 100644
+index f9be21e2f1bf..197ccefb29d9 100644
--- third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -63653,7 +63958,7 @@ index 3c92397fe562..197ccefb29d9 100644
FINAL_LIBRARY = "webrtc"
-@@ -57,191 +66,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -57,192 +66,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63723,6 +64028,7 @@ index 3c92397fe562..197ccefb29d9 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -63852,7 +64158,7 @@ index 3c92397fe562..197ccefb29d9 100644
Library("video_coding_gn")
diff --git third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
-index 3bbec9fb3074..92ff8a1d9819 100644
+index 1b3cbde3c555..92ff8a1d9819 100644
--- third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -63876,7 +64182,7 @@ index 3bbec9fb3074..92ff8a1d9819 100644
FINAL_LIBRARY = "webrtc"
-@@ -54,191 +63,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,192 +63,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63946,6 +64252,7 @@ index 3bbec9fb3074..92ff8a1d9819 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -64075,7 +64382,7 @@ index 3bbec9fb3074..92ff8a1d9819 100644
Library("video_coding_utility_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
-index 03437c5d57de..2adbff018445 100644
+index e896a6131bff..2adbff018445 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -64099,7 +64406,7 @@ index 03437c5d57de..2adbff018445 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64164,6 +64471,7 @@ index 03437c5d57de..2adbff018445 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -64286,7 +64594,7 @@ index 03437c5d57de..2adbff018445 100644
Library("webrtc_libvpx_interface_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
-index eb02eda6631d..8988f6d4b0ac 100644
+index ad8d5413a38f..8988f6d4b0ac 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -64310,7 +64618,7 @@ index eb02eda6631d..8988f6d4b0ac 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,191 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,192 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64380,6 +64688,7 @@ index eb02eda6631d..8988f6d4b0ac 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -64509,7 +64818,7 @@ index eb02eda6631d..8988f6d4b0ac 100644
Library("webrtc_vp8_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build
-index 3d5642df008a..3efc79029a22 100644
+index 75ebc86d1ec8..3efc79029a22 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -64533,7 +64842,7 @@ index 3d5642df008a..3efc79029a22 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64598,6 +64907,7 @@ index 3d5642df008a..3efc79029a22 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -64720,7 +65030,7 @@ index 3d5642df008a..3efc79029a22 100644
Library("webrtc_vp8_scalability_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
-index 7977e03d428c..64f1526a2eb2 100644
+index 274fd96ed74c..64f1526a2eb2 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -64744,7 +65054,7 @@ index 7977e03d428c..64f1526a2eb2 100644
FINAL_LIBRARY = "webrtc"
-@@ -48,191 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,192 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64814,6 +65124,7 @@ index 7977e03d428c..64f1526a2eb2 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -64943,7 +65254,7 @@ index 7977e03d428c..64f1526a2eb2 100644
Library("webrtc_vp8_temporal_layers_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
-index f470652e6d6c..03f7307e20ea 100644
+index 317232d8fc60..03f7307e20ea 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -64967,7 +65278,7 @@ index f470652e6d6c..03f7307e20ea 100644
FINAL_LIBRARY = "webrtc"
-@@ -48,191 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,192 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65037,6 +65348,7 @@ index f470652e6d6c..03f7307e20ea 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -65166,7 +65478,7 @@ index f470652e6d6c..03f7307e20ea 100644
Library("webrtc_vp9_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
-index 77a0c38f9903..0390ceb82364 100644
+index 935a69e8c86e..0390ceb82364 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -65190,7 +65502,7 @@ index 77a0c38f9903..0390ceb82364 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,192 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65260,6 +65572,7 @@ index 77a0c38f9903..0390ceb82364 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -65644,7 +65957,7 @@ index 5c9a364dd518..96c9b9570028 100644
- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
- ]
diff --git third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
-index b93fca231d69..be25257373e5 100644
+index 2770eeb1817d..be25257373e5 100644
--- third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
+++ third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -65668,7 +65981,7 @@ index b93fca231d69..be25257373e5 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65729,6 +66042,7 @@ index b93fca231d69..be25257373e5 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -65773,7 +66087,7 @@ index b93fca231d69..be25257373e5 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -65833,7 +66147,7 @@ index b93fca231d69..be25257373e5 100644
-
Library("async_packet_socket_gn")
diff --git third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build
-index 8e1b4e454d4d..ee64165c31d3 100644
+index c9bbe0532123..ee64165c31d3 100644
--- third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build
+++ third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -65857,7 +66171,7 @@ index 8e1b4e454d4d..ee64165c31d3 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,188 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65923,6 +66237,7 @@ index 8e1b4e454d4d..ee64165c31d3 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -66052,7 +66367,7 @@ index 8e1b4e454d4d..ee64165c31d3 100644
Library("async_resolver_interface_gn")
diff --git third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
-index d5cc0504b1d5..41df619ecefa 100644
+index f3d20adc3c2a..41df619ecefa 100644
--- third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
+++ third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -66076,7 +66391,7 @@ index d5cc0504b1d5..41df619ecefa 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66141,6 +66456,7 @@ index d5cc0504b1d5..41df619ecefa 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -66267,7 +66583,7 @@ index d5cc0504b1d5..41df619ecefa 100644
Library("audio_format_to_string_gn")
diff --git third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
-index 858cc304ba75..9d16e13e8efa 100644
+index 23a422bd5b94..9d16e13e8efa 100644
--- third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -66291,7 +66607,7 @@ index 858cc304ba75..9d16e13e8efa 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66356,6 +66672,7 @@ index 858cc304ba75..9d16e13e8efa 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -66478,7 +66795,7 @@ index 858cc304ba75..9d16e13e8efa 100644
Library("bit_buffer_gn")
diff --git third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
-index 77059cd34301..c5dabe6ad79f 100644
+index 99cf070668c2..c5dabe6ad79f 100644
--- third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
+++ third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -66502,7 +66819,7 @@ index 77059cd34301..c5dabe6ad79f 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66567,6 +66884,7 @@ index 77059cd34301..c5dabe6ad79f 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -66689,7 +67007,7 @@ index 77059cd34301..c5dabe6ad79f 100644
Library("bitstream_reader_gn")
diff --git third_party/libwebrtc/rtc_base/buffer_gn/moz.build third_party/libwebrtc/rtc_base/buffer_gn/moz.build
-index c378c3a0b2ac..31ea8d65c7ce 100644
+index 2f20b02bcbc8..31ea8d65c7ce 100644
--- third_party/libwebrtc/rtc_base/buffer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/buffer_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -66713,7 +67031,7 @@ index c378c3a0b2ac..31ea8d65c7ce 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66778,6 +67096,7 @@ index c378c3a0b2ac..31ea8d65c7ce 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -66822,7 +67141,7 @@ index c378c3a0b2ac..31ea8d65c7ce 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -66882,7 +67201,7 @@ index c378c3a0b2ac..31ea8d65c7ce 100644
-
Library("buffer_gn")
diff --git third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
-index 43ed668b71ad..292e0dc836d1 100644
+index 972a476b1638..292e0dc836d1 100644
--- third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -66906,7 +67225,7 @@ index 43ed668b71ad..292e0dc836d1 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66971,6 +67290,7 @@ index 43ed668b71ad..292e0dc836d1 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -67093,7 +67413,7 @@ index 43ed668b71ad..292e0dc836d1 100644
Library("byte_buffer_gn")
diff --git third_party/libwebrtc/rtc_base/byte_order_gn/moz.build third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
-index b49346b1540f..c8dbc51e612a 100644
+index 11268fffb95a..c8dbc51e612a 100644
--- third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
+++ third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -67117,7 +67437,7 @@ index b49346b1540f..c8dbc51e612a 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67178,6 +67498,7 @@ index b49346b1540f..c8dbc51e612a 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -67222,7 +67543,7 @@ index b49346b1540f..c8dbc51e612a 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -67282,7 +67603,7 @@ index b49346b1540f..c8dbc51e612a 100644
-
Library("byte_order_gn")
diff --git third_party/libwebrtc/rtc_base/checks_gn/moz.build third_party/libwebrtc/rtc_base/checks_gn/moz.build
-index 769362b62a5a..97a3da2b775a 100644
+index f0bcc0fca9cc..97a3da2b775a 100644
--- third_party/libwebrtc/rtc_base/checks_gn/moz.build
+++ third_party/libwebrtc/rtc_base/checks_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -67306,7 +67627,7 @@ index 769362b62a5a..97a3da2b775a 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67371,6 +67692,7 @@ index 769362b62a5a..97a3da2b775a 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -67493,7 +67815,7 @@ index 769362b62a5a..97a3da2b775a 100644
Library("checks_gn")
diff --git third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
-index 5fd417eefd5a..b997040b164c 100644
+index 6332dbc192d9..b997040b164c 100644
--- third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
+++ third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -67517,7 +67839,7 @@ index 5fd417eefd5a..b997040b164c 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67578,6 +67900,7 @@ index 5fd417eefd5a..b997040b164c 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -67622,7 +67945,7 @@ index 5fd417eefd5a..b997040b164c 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -67682,7 +68005,7 @@ index 5fd417eefd5a..b997040b164c 100644
-
Library("compile_assert_c_gn")
diff --git third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build
-index 2d02d778fffe..07b174d0c11e 100644
+index 55ee5d3dff3f..07b174d0c11e 100644
--- third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build
+++ third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -67706,7 +68029,7 @@ index 2d02d778fffe..07b174d0c11e 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67771,6 +68094,7 @@ index 2d02d778fffe..07b174d0c11e 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -67893,7 +68217,7 @@ index 2d02d778fffe..07b174d0c11e 100644
Library("flat_containers_internal_gn")
diff --git third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
-index f2d8ed054e00..df8ec55e92af 100644
+index 7ac656b224d3..df8ec55e92af 100644
--- third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
+++ third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -67917,7 +68241,7 @@ index f2d8ed054e00..df8ec55e92af 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67982,6 +68306,7 @@ index f2d8ed054e00..df8ec55e92af 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -68026,7 +68351,7 @@ index f2d8ed054e00..df8ec55e92af 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -68086,7 +68411,7 @@ index f2d8ed054e00..df8ec55e92af 100644
-
Library("flat_map_gn")
diff --git third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
-index 794ed8feb87a..6d2002a94fbc 100644
+index 2becdc86c59e..6d2002a94fbc 100644
--- third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
+++ third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -68110,7 +68435,7 @@ index 794ed8feb87a..6d2002a94fbc 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68175,6 +68500,7 @@ index 794ed8feb87a..6d2002a94fbc 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -68219,7 +68545,7 @@ index 794ed8feb87a..6d2002a94fbc 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -68279,7 +68605,7 @@ index 794ed8feb87a..6d2002a94fbc 100644
-
Library("flat_set_gn")
diff --git third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build
-index eecb53c907da..bcad4a983179 100644
+index b3140603223c..bcad4a983179 100644
--- third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -68303,7 +68629,7 @@ index eecb53c907da..bcad4a983179 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68368,6 +68694,7 @@ index eecb53c907da..bcad4a983179 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -68490,7 +68817,7 @@ index eecb53c907da..bcad4a983179 100644
Library("copy_on_write_buffer_gn")
diff --git third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
-index c8749bb51055..95e71cdfe9cf 100644
+index bcf2f7ca6057..95e71cdfe9cf 100644
--- third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
+++ third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -68514,7 +68841,7 @@ index c8749bb51055..95e71cdfe9cf 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68579,6 +68906,7 @@ index c8749bb51055..95e71cdfe9cf 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -68701,7 +69029,7 @@ index c8749bb51055..95e71cdfe9cf 100644
Library("criticalsection_gn")
diff --git third_party/libwebrtc/rtc_base/divide_round_gn/moz.build third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
-index 8bc1e665d50d..729bb35b5b49 100644
+index 42dbe0101bd9..729bb35b5b49 100644
--- third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
+++ third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -68725,7 +69053,7 @@ index 8bc1e665d50d..729bb35b5b49 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68790,6 +69118,7 @@ index 8bc1e665d50d..729bb35b5b49 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -68834,7 +69163,7 @@ index 8bc1e665d50d..729bb35b5b49 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -68894,7 +69223,7 @@ index 8bc1e665d50d..729bb35b5b49 100644
-
Library("divide_round_gn")
diff --git third_party/libwebrtc/rtc_base/dscp_gn/moz.build third_party/libwebrtc/rtc_base/dscp_gn/moz.build
-index b8b28d8d0161..4050d593d1b1 100644
+index 13f6e5c1e614..4050d593d1b1 100644
--- third_party/libwebrtc/rtc_base/dscp_gn/moz.build
+++ third_party/libwebrtc/rtc_base/dscp_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -68918,7 +69247,7 @@ index b8b28d8d0161..4050d593d1b1 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68979,6 +69308,7 @@ index b8b28d8d0161..4050d593d1b1 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -69023,7 +69353,7 @@ index b8b28d8d0161..4050d593d1b1 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -69083,7 +69413,7 @@ index b8b28d8d0161..4050d593d1b1 100644
-
Library("dscp_gn")
diff --git third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
-index 02fe978ab08d..c655f3b43877 100644
+index 0d2f54cb6630..c655f3b43877 100644
--- third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -69107,7 +69437,7 @@ index 02fe978ab08d..c655f3b43877 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69172,6 +69502,7 @@ index 02fe978ab08d..c655f3b43877 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -69298,7 +69629,7 @@ index 02fe978ab08d..c655f3b43877 100644
Library("event_tracer_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
-index 574d7d63026a..0d1253003f3d 100644
+index 873ea744002a..0d1253003f3d 100644
--- third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -69322,7 +69653,7 @@ index 574d7d63026a..0d1253003f3d 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69387,6 +69718,7 @@ index 574d7d63026a..0d1253003f3d 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -69513,7 +69845,7 @@ index 574d7d63026a..0d1253003f3d 100644
Library("alr_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
-index 34b388da69ec..e1cf8913860d 100644
+index e70ad11c923f..e1cf8913860d 100644
--- third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -69537,7 +69869,7 @@ index 34b388da69ec..e1cf8913860d 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69602,6 +69934,7 @@ index 34b388da69ec..e1cf8913860d 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -69728,7 +70061,7 @@ index 34b388da69ec..e1cf8913860d 100644
Library("balanced_degradation_settings_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build
-index ccc00e5296a1..54cef4764697 100644
+index cc93c29837ba..54cef4764697 100644
--- third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -69752,7 +70085,7 @@ index ccc00e5296a1..54cef4764697 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69817,6 +70150,7 @@ index ccc00e5296a1..54cef4764697 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -69943,7 +70277,7 @@ index ccc00e5296a1..54cef4764697 100644
Library("bandwidth_quality_scaler_settings_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build
-index 66d21c66a349..8118147f993e 100644
+index 012c461ffe1d..8118147f993e 100644
--- third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -69967,7 +70301,7 @@ index 66d21c66a349..8118147f993e 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -70032,6 +70366,7 @@ index 66d21c66a349..8118147f993e 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -70158,7 +70493,7 @@ index 66d21c66a349..8118147f993e 100644
Library("cpu_speed_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build
-index 1cf3a5d0f41f..ed59d2508985 100644
+index 31eaaa7d9a55..ed59d2508985 100644
--- third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -70182,7 +70517,7 @@ index 1cf3a5d0f41f..ed59d2508985 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -70247,6 +70582,7 @@ index 1cf3a5d0f41f..ed59d2508985 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -70373,7 +70709,7 @@ index 1cf3a5d0f41f..ed59d2508985 100644
Library("encoder_info_settings_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
-index 8147b9e99a24..3cd6aec92bc8 100644
+index bfa8be6e6f17..3cd6aec92bc8 100644
--- third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -70397,7 +70733,7 @@ index 8147b9e99a24..3cd6aec92bc8 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,183 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,184 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -70462,6 +70798,7 @@ index 8147b9e99a24..3cd6aec92bc8 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -70588,7 +70925,7 @@ index 8147b9e99a24..3cd6aec92bc8 100644
Library("field_trial_parser_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
-index b8ece40f9b6e..cd41f4b0b645 100644
+index 0169a46babde..cd41f4b0b645 100644
--- third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -70612,7 +70949,7 @@ index b8ece40f9b6e..cd41f4b0b645 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -70677,6 +71014,7 @@ index b8ece40f9b6e..cd41f4b0b645 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -70803,7 +71141,7 @@ index b8ece40f9b6e..cd41f4b0b645 100644
Library("keyframe_interval_settings_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
-index 0092a33c3916..0cbfa328d9ea 100644
+index bb394fe2975f..0cbfa328d9ea 100644
--- third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -70827,7 +71165,7 @@ index 0092a33c3916..0cbfa328d9ea 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -70892,6 +71230,7 @@ index 0092a33c3916..0cbfa328d9ea 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -71018,7 +71357,7 @@ index 0092a33c3916..0cbfa328d9ea 100644
Library("min_video_bitrate_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build
-index acf592c7634f..2b4feb9b7bdc 100644
+index 20e3713eb1d8..2b4feb9b7bdc 100644
--- third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -71042,7 +71381,7 @@ index acf592c7634f..2b4feb9b7bdc 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -71107,6 +71446,7 @@ index acf592c7634f..2b4feb9b7bdc 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -71233,7 +71573,7 @@ index acf592c7634f..2b4feb9b7bdc 100644
Library("normalize_simulcast_size_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build
-index aa454826f68b..1e8451135790 100644
+index ef8fd46914c9..1e8451135790 100644
--- third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -71257,7 +71597,7 @@ index aa454826f68b..1e8451135790 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -71322,6 +71662,7 @@ index aa454826f68b..1e8451135790 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -71448,7 +71789,7 @@ index aa454826f68b..1e8451135790 100644
Library("quality_rampup_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
-index c8c2708eb734..dcc3d66af2f3 100644
+index 6cc2035a2d7c..dcc3d66af2f3 100644
--- third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -71472,7 +71813,7 @@ index c8c2708eb734..dcc3d66af2f3 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -71537,6 +71878,7 @@ index c8c2708eb734..dcc3d66af2f3 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -71663,7 +72005,7 @@ index c8c2708eb734..dcc3d66af2f3 100644
Library("quality_scaler_settings_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
-index 2a84caa1a115..f4eec0f9ca31 100644
+index 2ecca976ab20..f4eec0f9ca31 100644
--- third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -71687,7 +72029,7 @@ index 2a84caa1a115..f4eec0f9ca31 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -71752,6 +72094,7 @@ index 2a84caa1a115..f4eec0f9ca31 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -71878,7 +72221,7 @@ index 2a84caa1a115..f4eec0f9ca31 100644
Library("quality_scaling_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
-index 6cbe9e8474cf..768d19687442 100644
+index cbf9703b88bd..768d19687442 100644
--- third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -71902,7 +72245,7 @@ index 6cbe9e8474cf..768d19687442 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -71967,6 +72310,7 @@ index 6cbe9e8474cf..768d19687442 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -72093,7 +72437,7 @@ index 6cbe9e8474cf..768d19687442 100644
Library("rate_control_settings_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build
-index aea652b1063e..faed80b04af8 100644
+index 8dfc5abd92e1..faed80b04af8 100644
--- third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -72117,7 +72461,7 @@ index aea652b1063e..faed80b04af8 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -72182,6 +72526,7 @@ index aea652b1063e..faed80b04af8 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -72308,7 +72653,7 @@ index aea652b1063e..faed80b04af8 100644
Library("rtt_mult_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
-index c1854a7f4dfb..5ba40788ff5d 100644
+index 0948e2a3b9fc..5ba40788ff5d 100644
--- third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -72332,7 +72677,7 @@ index c1854a7f4dfb..5ba40788ff5d 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -72397,6 +72742,7 @@ index c1854a7f4dfb..5ba40788ff5d 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -72523,7 +72869,7 @@ index c1854a7f4dfb..5ba40788ff5d 100644
Library("stable_target_rate_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
-index a6650bd66393..393c4a6a5b5f 100644
+index 696c146a4556..393c4a6a5b5f 100644
--- third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
+++ third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -72547,7 +72893,7 @@ index a6650bd66393..393c4a6a5b5f 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -72608,6 +72954,7 @@ index a6650bd66393..393c4a6a5b5f 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -72652,7 +72999,7 @@ index a6650bd66393..393c4a6a5b5f 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -72712,7 +73059,7 @@ index a6650bd66393..393c4a6a5b5f 100644
-
Library("gtest_prod_gn")
diff --git third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
-index 88e1ee554758..7f4ca498bb80 100644
+index d8033c9a59e0..7f4ca498bb80 100644
--- third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
+++ third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -72736,7 +73083,7 @@ index 88e1ee554758..7f4ca498bb80 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -72801,6 +73148,7 @@ index 88e1ee554758..7f4ca498bb80 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -73028,7 +73376,7 @@ index 01eeabbf70bc..000000000000
-
-Library("ifaddrs_android_gn")
diff --git third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
-index d7b06159cea2..ede6074320d3 100644
+index 7fab2a6316d5..ede6074320d3 100644
--- third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
+++ third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -73052,7 +73400,7 @@ index d7b06159cea2..ede6074320d3 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -73113,6 +73461,7 @@ index d7b06159cea2..ede6074320d3 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -73157,7 +73506,7 @@ index d7b06159cea2..ede6074320d3 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -73217,7 +73566,7 @@ index d7b06159cea2..ede6074320d3 100644
-
Library("ignore_wundef_gn")
diff --git third_party/libwebrtc/rtc_base/ip_address_gn/moz.build third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
-index a55837b63428..3310e1e14d3c 100644
+index 55c55c7b2b41..3310e1e14d3c 100644
--- third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
+++ third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -73241,7 +73590,7 @@ index a55837b63428..3310e1e14d3c 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,188 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -73307,6 +73656,7 @@ index a55837b63428..3310e1e14d3c 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -73436,7 +73786,7 @@ index a55837b63428..3310e1e14d3c 100644
Library("ip_address_gn")
diff --git third_party/libwebrtc/rtc_base/logging_gn/moz.build third_party/libwebrtc/rtc_base/logging_gn/moz.build
-index 80f4b0c95a9f..22d90f577490 100644
+index c58a306730f8..22d90f577490 100644
--- third_party/libwebrtc/rtc_base/logging_gn/moz.build
+++ third_party/libwebrtc/rtc_base/logging_gn/moz.build
@@ -12,12 +12,21 @@ AllowCompilerWarnings()
@@ -73461,7 +73811,7 @@ index 80f4b0c95a9f..22d90f577490 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,184 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -73526,6 +73876,7 @@ index 80f4b0c95a9f..22d90f577490 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -73652,7 +74003,7 @@ index 80f4b0c95a9f..22d90f577490 100644
Library("logging_gn")
diff --git third_party/libwebrtc/rtc_base/macromagic_gn/moz.build third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
-index 372b4d28f8a7..3a1e46270270 100644
+index b378b0e6d4b7..3a1e46270270 100644
--- third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
+++ third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -73676,7 +74027,7 @@ index 372b4d28f8a7..3a1e46270270 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -73737,6 +74088,7 @@ index 372b4d28f8a7..3a1e46270270 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -73781,7 +74133,7 @@ index 372b4d28f8a7..3a1e46270270 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -73841,7 +74193,7 @@ index 372b4d28f8a7..3a1e46270270 100644
-
Library("macromagic_gn")
diff --git third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
-index 139009098bab..eb01e8eadc57 100644
+index 0cccc551392d..eb01e8eadc57 100644
--- third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
+++ third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -73865,7 +74217,7 @@ index 139009098bab..eb01e8eadc57 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -73930,6 +74282,7 @@ index 139009098bab..eb01e8eadc57 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -74052,7 +74405,7 @@ index 139009098bab..eb01e8eadc57 100644
Library("aligned_malloc_gn")
diff --git third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
-index afe42b847585..ac5348af377a 100644
+index 5c80d3b59c8d..ac5348af377a 100644
--- third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
+++ third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -74076,7 +74429,7 @@ index afe42b847585..ac5348af377a 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -74141,6 +74494,7 @@ index afe42b847585..ac5348af377a 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -74185,7 +74539,7 @@ index afe42b847585..ac5348af377a 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -74245,7 +74599,7 @@ index afe42b847585..ac5348af377a 100644
-
Library("mod_ops_gn")
diff --git third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
-index fdbf859c3749..d20ce225c3f9 100644
+index c5694b5994f4..d20ce225c3f9 100644
--- third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
+++ third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -74269,7 +74623,7 @@ index fdbf859c3749..d20ce225c3f9 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -74334,6 +74688,7 @@ index fdbf859c3749..d20ce225c3f9 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -74378,7 +74733,7 @@ index fdbf859c3749..d20ce225c3f9 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -74438,7 +74793,7 @@ index fdbf859c3749..d20ce225c3f9 100644
-
Library("moving_max_counter_gn")
diff --git third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
-index 4ac9a06df874..7f32da55511f 100644
+index 1cb24c3d75c9..7f32da55511f 100644
--- third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
+++ third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -74462,7 +74817,7 @@ index 4ac9a06df874..7f32da55511f 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,188 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -74528,6 +74883,7 @@ index 4ac9a06df874..7f32da55511f 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -74657,7 +75013,7 @@ index 4ac9a06df874..7f32da55511f 100644
Library("net_helpers_gn")
diff --git third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
-index cdcbaee77937..ea4f2aacc117 100644
+index db9b0d613e4c..ea4f2aacc117 100644
--- third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
+++ third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -74681,7 +75037,7 @@ index cdcbaee77937..ea4f2aacc117 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,176 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -74742,6 +75098,7 @@ index cdcbaee77937..ea4f2aacc117 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -74864,7 +75221,7 @@ index cdcbaee77937..ea4f2aacc117 100644
Library("sent_packet_gn")
diff --git third_party/libwebrtc/rtc_base/network_constants_gn/moz.build third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
-index 9b7fb4a6703e..c5b7fcd69e98 100644
+index d108cfaaec00..c5b7fcd69e98 100644
--- third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
+++ third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -74888,7 +75245,7 @@ index 9b7fb4a6703e..c5b7fcd69e98 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -74953,6 +75310,7 @@ index 9b7fb4a6703e..c5b7fcd69e98 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -75075,7 +75433,7 @@ index 9b7fb4a6703e..c5b7fcd69e98 100644
Library("network_constants_gn")
diff --git third_party/libwebrtc/rtc_base/network_route_gn/moz.build third_party/libwebrtc/rtc_base/network_route_gn/moz.build
-index 7b0f634578f3..1ec2058feb83 100644
+index 659cf796f386..1ec2058feb83 100644
--- third_party/libwebrtc/rtc_base/network_route_gn/moz.build
+++ third_party/libwebrtc/rtc_base/network_route_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -75099,7 +75457,7 @@ index 7b0f634578f3..1ec2058feb83 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -75164,6 +75522,7 @@ index 7b0f634578f3..1ec2058feb83 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -75286,7 +75645,7 @@ index 7b0f634578f3..1ec2058feb83 100644
Library("network_route_gn")
diff --git third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
-index f77bcf8aa788..df6cf74c5b16 100644
+index 09c94861965b..df6cf74c5b16 100644
--- third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
+++ third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -75310,7 +75669,7 @@ index f77bcf8aa788..df6cf74c5b16 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,188 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -75376,6 +75735,7 @@ index f77bcf8aa788..df6cf74c5b16 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -75505,7 +75865,7 @@ index f77bcf8aa788..df6cf74c5b16 100644
Library("null_socket_server_gn")
diff --git third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
-index ac24f995c6c1..a8d26b774863 100644
+index 81275000b3a9..a8d26b774863 100644
--- third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
+++ third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -75529,7 +75889,7 @@ index ac24f995c6c1..a8d26b774863 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -75594,6 +75954,7 @@ index ac24f995c6c1..a8d26b774863 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -75638,7 +75999,7 @@ index ac24f995c6c1..a8d26b774863 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -75698,7 +76059,7 @@ index ac24f995c6c1..a8d26b774863 100644
-
Library("one_time_event_gn")
diff --git third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
-index c580f7e67a0a..3fea9a2d6b27 100644
+index 877e4decb1be..3fea9a2d6b27 100644
--- third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
+++ third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -75722,7 +76083,7 @@ index c580f7e67a0a..3fea9a2d6b27 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -75787,6 +76148,7 @@ index c580f7e67a0a..3fea9a2d6b27 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -75913,7 +76275,7 @@ index c580f7e67a0a..3fea9a2d6b27 100644
Library("platform_thread_gn")
diff --git third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
-index 713a9cc2fdf7..99ec083c6586 100644
+index 24624a54124d..99ec083c6586 100644
--- third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
+++ third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -75937,7 +76299,7 @@ index 713a9cc2fdf7..99ec083c6586 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76002,6 +76364,7 @@ index 713a9cc2fdf7..99ec083c6586 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -76124,7 +76487,7 @@ index 713a9cc2fdf7..99ec083c6586 100644
Library("platform_thread_types_gn")
diff --git third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
-index a5a3d7492137..d9d75b3b91be 100644
+index 1e53b0ac392a..d9d75b3b91be 100644
--- third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
+++ third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -76148,7 +76511,7 @@ index a5a3d7492137..d9d75b3b91be 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76209,6 +76572,7 @@ index a5a3d7492137..d9d75b3b91be 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -76253,7 +76617,7 @@ index a5a3d7492137..d9d75b3b91be 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -76313,7 +76677,7 @@ index a5a3d7492137..d9d75b3b91be 100644
-
Library("protobuf_utils_gn")
diff --git third_party/libwebrtc/rtc_base/race_checker_gn/moz.build third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
-index 514f8957fee9..e3529cc2a54b 100644
+index b19361782bda..e3529cc2a54b 100644
--- third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
+++ third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -76337,7 +76701,7 @@ index 514f8957fee9..e3529cc2a54b 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76402,6 +76766,7 @@ index 514f8957fee9..e3529cc2a54b 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -76524,7 +76889,7 @@ index 514f8957fee9..e3529cc2a54b 100644
Library("race_checker_gn")
diff --git third_party/libwebrtc/rtc_base/random_gn/moz.build third_party/libwebrtc/rtc_base/random_gn/moz.build
-index 9b3592566474..9c8984a140d6 100644
+index 5f1ba9dd7dda..9c8984a140d6 100644
--- third_party/libwebrtc/rtc_base/random_gn/moz.build
+++ third_party/libwebrtc/rtc_base/random_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -76548,7 +76913,7 @@ index 9b3592566474..9c8984a140d6 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76613,6 +76978,7 @@ index 9b3592566474..9c8984a140d6 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -76735,7 +77101,7 @@ index 9b3592566474..9c8984a140d6 100644
Library("random_gn")
diff --git third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
-index 969a79b712df..51b27be6a666 100644
+index c9bd8fc31625..51b27be6a666 100644
--- third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -76759,7 +77125,7 @@ index 969a79b712df..51b27be6a666 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76828,6 +77194,7 @@ index 969a79b712df..51b27be6a666 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -76957,7 +77324,7 @@ index 969a79b712df..51b27be6a666 100644
Library("rate_limiter_gn")
diff --git third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
-index b40a4fdda662..ec6d4550feef 100644
+index 5b7ef1d09da3..ec6d4550feef 100644
--- third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -76981,7 +77348,7 @@ index b40a4fdda662..ec6d4550feef 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -77046,6 +77413,7 @@ index b40a4fdda662..ec6d4550feef 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -77172,7 +77540,7 @@ index b40a4fdda662..ec6d4550feef 100644
Library("rate_statistics_gn")
diff --git third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
-index 26f81f4f5ed3..a7abd9b6b0e7 100644
+index 7849033fd901..a7abd9b6b0e7 100644
--- third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -77196,7 +77564,7 @@ index 26f81f4f5ed3..a7abd9b6b0e7 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -77261,6 +77629,7 @@ index 26f81f4f5ed3..a7abd9b6b0e7 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -77387,7 +77756,7 @@ index 26f81f4f5ed3..a7abd9b6b0e7 100644
Library("rate_tracker_gn")
diff --git third_party/libwebrtc/rtc_base/refcount_gn/moz.build third_party/libwebrtc/rtc_base/refcount_gn/moz.build
-index f8c49daa900e..091d88e0545b 100644
+index 6148636dbf78..091d88e0545b 100644
--- third_party/libwebrtc/rtc_base/refcount_gn/moz.build
+++ third_party/libwebrtc/rtc_base/refcount_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -77411,7 +77780,7 @@ index f8c49daa900e..091d88e0545b 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -77472,6 +77841,7 @@ index f8c49daa900e..091d88e0545b 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -77516,7 +77886,7 @@ index f8c49daa900e..091d88e0545b 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -77576,7 +77946,7 @@ index f8c49daa900e..091d88e0545b 100644
-
Library("refcount_gn")
diff --git third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
-index eef6c6bc5d45..f04b9eb51ce7 100644
+index dbb5ee27409d..f04b9eb51ce7 100644
--- third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -77600,7 +77970,7 @@ index eef6c6bc5d45..f04b9eb51ce7 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -77665,6 +78035,7 @@ index eef6c6bc5d45..f04b9eb51ce7 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -77709,7 +78080,7 @@ index eef6c6bc5d45..f04b9eb51ce7 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -77769,7 +78140,7 @@ index eef6c6bc5d45..f04b9eb51ce7 100644
-
Library("rolling_accumulator_gn")
diff --git third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
-index db71c35a1add..d03fb3f4e7c8 100644
+index 6fde36031cdc..d03fb3f4e7c8 100644
--- third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -77793,7 +78164,7 @@ index db71c35a1add..d03fb3f4e7c8 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -77858,6 +78229,7 @@ index db71c35a1add..d03fb3f4e7c8 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -77984,7 +78356,7 @@ index db71c35a1add..d03fb3f4e7c8 100644
Library("rtc_event_gn")
diff --git third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
-index 65d2c5bb2a2b..1b6e8cb951db 100644
+index 0a3d3778dd4f..1b6e8cb951db 100644
--- third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -78008,7 +78380,7 @@ index 65d2c5bb2a2b..1b6e8cb951db 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,179 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,180 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -78073,6 +78445,7 @@ index 65d2c5bb2a2b..1b6e8cb951db 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -78195,7 +78568,7 @@ index 65d2c5bb2a2b..1b6e8cb951db 100644
Library("rtc_numerics_gn")
diff --git third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build
-index ae0702954d53..8e76dcf845cb 100644
+index e1bac3e15f00..8e76dcf845cb 100644
--- third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -78219,7 +78592,7 @@ index ae0702954d53..8e76dcf845cb 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -78284,6 +78657,7 @@ index ae0702954d53..8e76dcf845cb 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -78406,7 +78780,7 @@ index ae0702954d53..8e76dcf845cb 100644
Library("rtc_task_queue_gn")
diff --git third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
-index 706eb51c9788..5dba9b3a8401 100644
+index 449c108dd12f..5dba9b3a8401 100644
--- third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
+++ third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -78430,7 +78804,7 @@ index 706eb51c9788..5dba9b3a8401 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -78491,6 +78865,7 @@ index 706eb51c9788..5dba9b3a8401 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -78535,7 +78910,7 @@ index 706eb51c9788..5dba9b3a8401 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -78595,7 +78970,7 @@ index 706eb51c9788..5dba9b3a8401 100644
-
Library("safe_compare_gn")
diff --git third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
-index 545467bc2319..bc31d2ede82f 100644
+index 8466a0ff6381..bc31d2ede82f 100644
--- third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
+++ third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -78619,7 +78994,7 @@ index 545467bc2319..bc31d2ede82f 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -78684,6 +79059,7 @@ index 545467bc2319..bc31d2ede82f 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -78728,7 +79104,7 @@ index 545467bc2319..bc31d2ede82f 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -78788,7 +79164,7 @@ index 545467bc2319..bc31d2ede82f 100644
-
Library("safe_conversions_gn")
diff --git third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
-index 51c1b7bacdf8..fb72b6128335 100644
+index 5083ad7ece3c..fb72b6128335 100644
--- third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
+++ third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -78812,7 +79188,7 @@ index 51c1b7bacdf8..fb72b6128335 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -78877,6 +79253,7 @@ index 51c1b7bacdf8..fb72b6128335 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -78921,7 +79298,7 @@ index 51c1b7bacdf8..fb72b6128335 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -78981,7 +79358,7 @@ index 51c1b7bacdf8..fb72b6128335 100644
-
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 a477e2cd2de2..f8c37e47fe73 100644
+index 15aaa60d07e9..f8c37e47fe73 100644
--- third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
+++ third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -79005,7 +79382,7 @@ index a477e2cd2de2..f8c37e47fe73 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -79070,6 +79447,7 @@ index a477e2cd2de2..f8c37e47fe73 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -79192,7 +79570,7 @@ index a477e2cd2de2..f8c37e47fe73 100644
Library("sample_counter_gn")
diff --git third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
-index efdfb15485e3..d22a78d96416 100644
+index 784158853c08..d22a78d96416 100644
--- third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -79216,7 +79594,7 @@ index efdfb15485e3..d22a78d96416 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -79277,6 +79655,7 @@ index efdfb15485e3..d22a78d96416 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -79321,7 +79700,7 @@ index efdfb15485e3..d22a78d96416 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -79381,7 +79760,7 @@ index efdfb15485e3..d22a78d96416 100644
-
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 8315d358e6ec..40ffca5c22d9 100644
+index 9afa5cd024e3..40ffca5c22d9 100644
--- third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
+++ third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -79405,7 +79784,7 @@ index 8315d358e6ec..40ffca5c22d9 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,188 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -79471,6 +79850,7 @@ index 8315d358e6ec..40ffca5c22d9 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -79600,7 +79980,7 @@ index 8315d358e6ec..40ffca5c22d9 100644
Library("socket_address_gn")
diff --git third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
-index 43a7eff46eba..4ba64ef8e106 100644
+index c02dec480dca..4ba64ef8e106 100644
--- third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
+++ third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -79624,7 +80004,7 @@ index 43a7eff46eba..4ba64ef8e106 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,115 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,116 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -79690,6 +80070,7 @@ index 43a7eff46eba..4ba64ef8e106 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -79741,7 +80122,7 @@ index 43a7eff46eba..4ba64ef8e106 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -157,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -158,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -79801,7 +80182,7 @@ index 43a7eff46eba..4ba64ef8e106 100644
-
Library("socket_factory_gn")
diff --git third_party/libwebrtc/rtc_base/socket_gn/moz.build third_party/libwebrtc/rtc_base/socket_gn/moz.build
-index 8fa7b5f8b019..d603411799ed 100644
+index 83db68580b5a..d603411799ed 100644
--- third_party/libwebrtc/rtc_base/socket_gn/moz.build
+++ third_party/libwebrtc/rtc_base/socket_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -79825,7 +80206,7 @@ index 8fa7b5f8b019..d603411799ed 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,188 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -79891,6 +80272,7 @@ index 8fa7b5f8b019..d603411799ed 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -80020,7 +80402,7 @@ index 8fa7b5f8b019..d603411799ed 100644
Library("socket_gn")
diff --git third_party/libwebrtc/rtc_base/socket_server_gn/moz.build third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
-index 19fae93cf479..8f5896e37a22 100644
+index 6320abc39e30..8f5896e37a22 100644
--- third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
+++ third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -80044,7 +80426,7 @@ index 19fae93cf479..8f5896e37a22 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,115 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,116 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -80110,6 +80492,7 @@ index 19fae93cf479..8f5896e37a22 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -80161,7 +80544,7 @@ index 19fae93cf479..8f5896e37a22 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -157,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -158,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -80221,7 +80604,7 @@ index 19fae93cf479..8f5896e37a22 100644
-
Library("socket_server_gn")
diff --git third_party/libwebrtc/rtc_base/ssl_gn/moz.build third_party/libwebrtc/rtc_base/ssl_gn/moz.build
-index 79c9fd515372..ed15371747a9 100644
+index 0d572011c191..ed15371747a9 100644
--- third_party/libwebrtc/rtc_base/ssl_gn/moz.build
+++ third_party/libwebrtc/rtc_base/ssl_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -80245,7 +80628,7 @@ index 79c9fd515372..ed15371747a9 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -80306,6 +80689,7 @@ index 79c9fd515372..ed15371747a9 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -80350,7 +80734,7 @@ index 79c9fd515372..ed15371747a9 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -80410,7 +80794,7 @@ index 79c9fd515372..ed15371747a9 100644
-
Library("ssl_gn")
diff --git third_party/libwebrtc/rtc_base/stringutils_gn/moz.build third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
-index c2ae423ea9b5..a65888b3d464 100644
+index a3fa39370208..a65888b3d464 100644
--- third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
+++ third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -80434,7 +80818,7 @@ index c2ae423ea9b5..a65888b3d464 100644
FINAL_LIBRARY = "webrtc"
-@@ -47,179 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,180 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -80499,6 +80883,7 @@ index c2ae423ea9b5..a65888b3d464 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -80621,7 +81006,7 @@ index c2ae423ea9b5..a65888b3d464 100644
Library("stringutils_gn")
diff --git third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
-index 630648f5f5fa..2863ba28d144 100644
+index d1c309fba660..2863ba28d144 100644
--- third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
+++ third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -80645,7 +81030,7 @@ index 630648f5f5fa..2863ba28d144 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -80710,6 +81095,7 @@ index 630648f5f5fa..2863ba28d144 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -80754,7 +81140,7 @@ index 630648f5f5fa..2863ba28d144 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -80814,7 +81200,7 @@ index 630648f5f5fa..2863ba28d144 100644
-
Library("swap_queue_gn")
diff --git third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
-index 34792dc4327c..fc8b3b58110e 100644
+index 0ce4ad614ff5..fc8b3b58110e 100644
--- third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
+++ third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -80838,7 +81224,7 @@ index 34792dc4327c..fc8b3b58110e 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -80903,6 +81289,7 @@ index 34792dc4327c..fc8b3b58110e 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -80947,7 +81334,7 @@ index 34792dc4327c..fc8b3b58110e 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -81007,7 +81394,7 @@ index 34792dc4327c..fc8b3b58110e 100644
-
Library("mutex_gn")
diff --git third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
-index 85cf1f73b599..fb8a358b2eaa 100644
+index 6905e0e29cdd..fb8a358b2eaa 100644
--- third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
+++ third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -81031,7 +81418,7 @@ index 85cf1f73b599..fb8a358b2eaa 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -81096,6 +81483,7 @@ index 85cf1f73b599..fb8a358b2eaa 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -81218,7 +81606,7 @@ index 85cf1f73b599..fb8a358b2eaa 100644
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 363b084539be..1fe57f535305 100644
+index 146d31e18ef0..1fe57f535305 100644
--- third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
+++ third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -81242,7 +81630,7 @@ index 363b084539be..1fe57f535305 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,176 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -81303,6 +81691,7 @@ index 363b084539be..1fe57f535305 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -81425,7 +81814,7 @@ index 363b084539be..1fe57f535305 100644
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 9356f30910a3..edfb4475bbd2 100644
+index edb383fcc420..edfb4475bbd2 100644
--- third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
+++ third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -81449,7 +81838,7 @@ index 9356f30910a3..edfb4475bbd2 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -81514,6 +81903,7 @@ index 9356f30910a3..edfb4475bbd2 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -81636,7 +82026,7 @@ index 9356f30910a3..edfb4475bbd2 100644
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 4f8f93c154e2..a836f5db63f0 100644
+index fea742e2cf62..a836f5db63f0 100644
--- third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -81660,7 +82050,7 @@ index 4f8f93c154e2..a836f5db63f0 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -81721,6 +82111,7 @@ index 4f8f93c154e2..a836f5db63f0 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -81765,7 +82156,7 @@ index 4f8f93c154e2..a836f5db63f0 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -81984,7 +82375,7 @@ index f897cf46fc39..000000000000
-
-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 9954e2772e10..7cc6dfb3b3a6 100644
+index 3aab8075e24b..7cc6dfb3b3a6 100644
--- third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -82008,7 +82399,7 @@ index 9954e2772e10..7cc6dfb3b3a6 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -82073,6 +82464,7 @@ index 9954e2772e10..7cc6dfb3b3a6 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -82268,7 +82660,7 @@ index 99fbd80dd967..000000000000
-
-Library("gcd_helpers_gn")
diff --git third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
-index 396d7286299f..ae27ee47b74f 100644
+index 5f7d238f17bf..ae27ee47b74f 100644
--- third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -82292,7 +82684,7 @@ index 396d7286299f..ae27ee47b74f 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -82353,6 +82745,7 @@ index 396d7286299f..ae27ee47b74f 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -82397,7 +82790,7 @@ index 396d7286299f..ae27ee47b74f 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -82457,7 +82850,7 @@ index 396d7286299f..ae27ee47b74f 100644
-
Library("ignore_warnings_gn")
diff --git third_party/libwebrtc/rtc_base/system/inline_gn/moz.build third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
-index 110c04a6be19..47a6efea00c5 100644
+index bd94bfe087b2..47a6efea00c5 100644
--- third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -82481,7 +82874,7 @@ index 110c04a6be19..47a6efea00c5 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -82542,6 +82935,7 @@ index 110c04a6be19..47a6efea00c5 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -82586,7 +82980,7 @@ index 110c04a6be19..47a6efea00c5 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -82646,7 +83040,7 @@ index 110c04a6be19..47a6efea00c5 100644
-
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 bbf86f67bb61..8b4b89ce8c24 100644
+index 5d348b9cc930..8b4b89ce8c24 100644
--- third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -82670,7 +83064,7 @@ index bbf86f67bb61..8b4b89ce8c24 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -82731,6 +83125,7 @@ index bbf86f67bb61..8b4b89ce8c24 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -82775,7 +83170,7 @@ index bbf86f67bb61..8b4b89ce8c24 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -82835,7 +83230,7 @@ index bbf86f67bb61..8b4b89ce8c24 100644
-
Library("no_unique_address_gn")
diff --git third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
-index a26fbd0aecc7..7773038a2267 100644
+index 067363ace2be..7773038a2267 100644
--- third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -82859,7 +83254,7 @@ index a26fbd0aecc7..7773038a2267 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -82920,6 +83315,7 @@ index a26fbd0aecc7..7773038a2267 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -82964,7 +83360,7 @@ index a26fbd0aecc7..7773038a2267 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -83024,7 +83420,7 @@ index a26fbd0aecc7..7773038a2267 100644
-
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 c53e1ab3ba55..3c5c6131f5b6 100644
+index 256ebc77b2a8..3c5c6131f5b6 100644
--- third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -83048,7 +83444,7 @@ index c53e1ab3ba55..3c5c6131f5b6 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -83109,6 +83505,7 @@ index c53e1ab3ba55..3c5c6131f5b6 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -83153,7 +83550,7 @@ index c53e1ab3ba55..3c5c6131f5b6 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -83213,7 +83610,7 @@ index c53e1ab3ba55..3c5c6131f5b6 100644
-
Library("unused_gn")
diff --git third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
-index 6d5043ae77f0..68764f971a8c 100644
+index 9f73b17c3b09..68764f971a8c 100644
--- third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -83237,7 +83634,7 @@ index 6d5043ae77f0..68764f971a8c 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -83298,6 +83695,7 @@ index 6d5043ae77f0..68764f971a8c 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -83342,7 +83740,7 @@ index 6d5043ae77f0..68764f971a8c 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -83402,7 +83800,7 @@ index 6d5043ae77f0..68764f971a8c 100644
-
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 8aecd5889008..677563f0eafb 100644
+index e4598ce419da..677563f0eafb 100644
--- third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
+++ third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -83426,7 +83824,7 @@ index 8aecd5889008..677563f0eafb 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -83495,6 +83893,7 @@ index 8aecd5889008..677563f0eafb 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -83624,7 +84023,7 @@ index 8aecd5889008..677563f0eafb 100644
Library("repeating_task_gn")
diff --git third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
-index 6077e21b3779..af27c83c7e93 100644
+index 92adac14647c..af27c83c7e93 100644
--- third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
+++ third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -83648,7 +84047,7 @@ index 6077e21b3779..af27c83c7e93 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -83713,6 +84112,7 @@ index 6077e21b3779..af27c83c7e93 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -83835,7 +84235,7 @@ index 6077e21b3779..af27c83c7e93 100644
Library("base64_gn")
diff --git third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
-index 3f4690993100..c78bc1de22c4 100644
+index 4fdf4e2c69c8..c78bc1de22c4 100644
--- third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
+++ third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -83859,7 +84259,7 @@ index 3f4690993100..c78bc1de22c4 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,176 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -83920,6 +84320,7 @@ index 3f4690993100..c78bc1de22c4 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -84042,7 +84443,7 @@ index 3f4690993100..c78bc1de22c4 100644
Library("sigslot_gn")
diff --git third_party/libwebrtc/rtc_base/threading_gn/moz.build third_party/libwebrtc/rtc_base/threading_gn/moz.build
-index 39235d88fc45..74684735d856 100644
+index e93be2e06273..74684735d856 100644
--- third_party/libwebrtc/rtc_base/threading_gn/moz.build
+++ third_party/libwebrtc/rtc_base/threading_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -84066,7 +84467,7 @@ index 39235d88fc45..74684735d856 100644
FINAL_LIBRARY = "webrtc"
-@@ -48,187 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,188 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -84132,6 +84533,7 @@ index 39235d88fc45..74684735d856 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -84261,7 +84663,7 @@ index 39235d88fc45..74684735d856 100644
Library("threading_gn")
diff --git third_party/libwebrtc/rtc_base/timeutils_gn/moz.build third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
-index 3f184279a3a0..432c438bdad6 100644
+index a0ade7c241f5..432c438bdad6 100644
--- third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
+++ third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
@@ -12,12 +12,21 @@ AllowCompilerWarnings()
@@ -84286,7 +84688,7 @@ index 3f184279a3a0..432c438bdad6 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,183 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,184 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -84351,6 +84753,7 @@ index 3f184279a3a0..432c438bdad6 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -84477,7 +84880,7 @@ index 3f184279a3a0..432c438bdad6 100644
Library("timeutils_gn")
diff --git third_party/libwebrtc/rtc_base/type_traits_gn/moz.build third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
-index b5c9fb51224c..7ff959ba5f38 100644
+index df8f6cdd755a..7ff959ba5f38 100644
--- third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
+++ third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -84501,7 +84904,7 @@ index b5c9fb51224c..7ff959ba5f38 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -84562,6 +84965,7 @@ index b5c9fb51224c..7ff959ba5f38 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -84606,7 +85010,7 @@ index b5c9fb51224c..7ff959ba5f38 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -84666,7 +85070,7 @@ index b5c9fb51224c..7ff959ba5f38 100644
-
Library("type_traits_gn")
diff --git third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build
-index 4ff4d51c78ea..93be9abd91cd 100644
+index b0b9c9c52dd8..93be9abd91cd 100644
--- third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build
+++ third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -84690,7 +85094,7 @@ index 4ff4d51c78ea..93be9abd91cd 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -84751,6 +85155,7 @@ index 4ff4d51c78ea..93be9abd91cd 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -84795,7 +85200,7 @@ index 4ff4d51c78ea..93be9abd91cd 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -84855,7 +85260,7 @@ index 4ff4d51c78ea..93be9abd91cd 100644
-
Library("unique_id_generator_gn")
diff --git third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
-index 35e3af076731..22bf007b975e 100644
+index 41be8fc91445..22bf007b975e 100644
--- third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
+++ third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -84879,7 +85284,7 @@ index 35e3af076731..22bf007b975e 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -84944,6 +85349,7 @@ index 35e3af076731..22bf007b975e 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -84988,7 +85394,7 @@ index 35e3af076731..22bf007b975e 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -85048,7 +85454,7 @@ index 35e3af076731..22bf007b975e 100644
-
Library("unit_base_gn")
diff --git third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
-index 93a833f2a3a7..c1c245b6e62b 100644
+index d79f76d8b891..c1c245b6e62b 100644
--- third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
+++ third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -85072,7 +85478,7 @@ index 93a833f2a3a7..c1c245b6e62b 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -85137,6 +85543,7 @@ index 93a833f2a3a7..c1c245b6e62b 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -85260,10 +85667,10 @@ index 93a833f2a3a7..c1c245b6e62b 100644
Library("weak_ptr_gn")
diff --git third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build
deleted file mode 100644
-index d5882af2bb01..000000000000
+index 4c921b77296a..000000000000
--- third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build
+++ /dev/null
-@@ -1,84 +0,0 @@
+@@ -1,85 +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/.
@@ -85282,6 +85689,7 @@ index d5882af2bb01..000000000000
-DEFINES["PSAPI_VERSION"] = "2"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["RTC_ENABLE_WIN_WGC"] = True
-DEFINES["UNICODE"] = True
-DEFINES["USE_AURA"] = "1"
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -85350,10 +85758,10 @@ index d5882af2bb01..000000000000
-Library("create_direct3d_device_gn")
diff --git third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build
deleted file mode 100644
-index d2449d9860b7..000000000000
+index 28e20e8f8696..000000000000
--- third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build
+++ /dev/null
-@@ -1,84 +0,0 @@
+@@ -1,85 +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/.
@@ -85372,6 +85780,7 @@ index d2449d9860b7..000000000000
-DEFINES["PSAPI_VERSION"] = "2"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["RTC_ENABLE_WIN_WGC"] = True
-DEFINES["UNICODE"] = True
-DEFINES["USE_AURA"] = "1"
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -85440,10 +85849,10 @@ index d2449d9860b7..000000000000
-Library("get_activation_factory_gn")
diff --git third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build
deleted file mode 100644
-index 3a495f5b6ca0..000000000000
+index d4a0da8201e4..000000000000
--- third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build
+++ /dev/null
-@@ -1,84 +0,0 @@
+@@ -1,85 +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/.
@@ -85462,6 +85871,7 @@ index 3a495f5b6ca0..000000000000
-DEFINES["PSAPI_VERSION"] = "2"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["RTC_ENABLE_WIN_WGC"] = True
-DEFINES["UNICODE"] = True
-DEFINES["USE_AURA"] = "1"
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -85530,10 +85940,10 @@ index 3a495f5b6ca0..000000000000
-Library("hstring_gn")
diff --git third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build
deleted file mode 100644
-index 88dc67ea4893..000000000000
+index 759f3f6c7cf7..000000000000
--- third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build
+++ /dev/null
-@@ -1,84 +0,0 @@
+@@ -1,85 +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/.
@@ -85552,6 +85962,7 @@ index 88dc67ea4893..000000000000
-DEFINES["PSAPI_VERSION"] = "2"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["RTC_ENABLE_WIN_WGC"] = True
-DEFINES["UNICODE"] = True
-DEFINES["USE_AURA"] = "1"
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -85620,10 +86031,10 @@ index 88dc67ea4893..000000000000
-Library("windows_version_gn")
diff --git third_party/libwebrtc/rtc_base/win32_gn/moz.build third_party/libwebrtc/rtc_base/win32_gn/moz.build
deleted file mode 100644
-index 656bd4014be6..000000000000
+index f57361432c58..000000000000
--- third_party/libwebrtc/rtc_base/win32_gn/moz.build
+++ /dev/null
-@@ -1,93 +0,0 @@
+@@ -1,94 +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/.
@@ -85642,6 +86053,7 @@ index 656bd4014be6..000000000000
-DEFINES["PSAPI_VERSION"] = "2"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["RTC_ENABLE_WIN_WGC"] = True
-DEFINES["UNICODE"] = True
-DEFINES["USE_AURA"] = "1"
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -85718,7 +86130,7 @@ index 656bd4014be6..000000000000
-
-Library("win32_gn")
diff --git third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
-index b186530b19c6..eaf3581aaff9 100644
+index 50a16127870e..eaf3581aaff9 100644
--- third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
+++ third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -85742,7 +86154,7 @@ index b186530b19c6..eaf3581aaff9 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -85807,6 +86219,7 @@ index b186530b19c6..eaf3581aaff9 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -86250,7 +86663,7 @@ index dea03fa57466..000000000000
-
-Library("videoframebuffer_objc_gn")
diff --git third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build
-index 10482ec2ea89..064ddd6f7ea0 100644
+index 673104d2b95e..064ddd6f7ea0 100644
--- third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build
+++ third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -86274,7 +86687,7 @@ index 10482ec2ea89..064ddd6f7ea0 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -86339,6 +86752,7 @@ index 10482ec2ea89..064ddd6f7ea0 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -86461,7 +86875,7 @@ index 10482ec2ea89..064ddd6f7ea0 100644
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 9bbb11725944..53f2c83c65cc 100644
+index 780a6fdef2f1..53f2c83c65cc 100644
--- third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
+++ third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -86485,7 +86899,7 @@ index 9bbb11725944..53f2c83c65cc 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -86550,6 +86964,7 @@ index 9bbb11725944..53f2c83c65cc 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -86676,7 +87091,7 @@ index 9bbb11725944..53f2c83c65cc 100644
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 b4982671c9fb..a5e24c852a0d 100644
+index 5d679baee740..a5e24c852a0d 100644
--- third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
+++ third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -86700,7 +87115,7 @@ index b4982671c9fb..a5e24c852a0d 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -86765,6 +87180,7 @@ index b4982671c9fb..a5e24c852a0d 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -86887,7 +87303,7 @@ index b4982671c9fb..a5e24c852a0d 100644
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 bfc6aa12f922..2c316fbc9e0f 100644
+index 87073f2fd353..2c316fbc9e0f 100644
--- third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
+++ third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -86911,7 +87327,7 @@ index bfc6aa12f922..2c316fbc9e0f 100644
FINAL_LIBRARY = "webrtc"
-@@ -47,200 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,201 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -86990,6 +87406,7 @@ index bfc6aa12f922..2c316fbc9e0f 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -87119,7 +87536,7 @@ index bfc6aa12f922..2c316fbc9e0f 100644
Library("system_wrappers_gn")
diff --git third_party/libwebrtc/test/rtp_test_utils_gn/moz.build third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
-index a93c14603d74..c15a9ae02722 100644
+index 1cd4c6d56957..c15a9ae02722 100644
--- third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
+++ third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -87143,7 +87560,7 @@ index a93c14603d74..c15a9ae02722 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,120 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -87213,6 +87630,7 @@ index a93c14603d74..c15a9ae02722 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -87264,7 +87682,7 @@ index a93c14603d74..c15a9ae02722 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -161,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -162,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -91414,7 +91832,7 @@ index 646e12d72d60..d307f2650a1b 100644
DEFINES["USE_X11"] = "1"
diff --git third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
-index 2d97f962e7f9..dcece6e53f93 100644
+index 0333e014b67d..dcece6e53f93 100644
--- third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
+++ third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -91438,7 +91856,7 @@ index 2d97f962e7f9..dcece6e53f93 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,103 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,104 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -91499,6 +91917,7 @@ index 2d97f962e7f9..dcece6e53f93 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -91543,7 +91962,7 @@ index 2d97f962e7f9..dcece6e53f93 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -147,57 +70,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -148,57 +70,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -91994,7 +92413,7 @@ index 2a3db9a62207..087012313675 100644
Library("rnn_vad_gn")
diff --git third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
-index 1459a2b50d95..c019774c6343 100644
+index d36c68f6c12c..c019774c6343 100644
--- third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
+++ third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -92018,7 +92437,7 @@ index 1459a2b50d95..c019774c6343 100644
FINAL_LIBRARY = "webrtc"
-@@ -52,191 +61,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,192 +61,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92088,6 +92507,7 @@ index 1459a2b50d95..c019774c6343 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -92217,7 +92637,7 @@ index 1459a2b50d95..c019774c6343 100644
Library("video_adaptation_gn")
diff --git third_party/libwebrtc/video/config/encoder_config_gn/moz.build third_party/libwebrtc/video/config/encoder_config_gn/moz.build
-index ea2b54bfb866..2dc027987bb6 100644
+index daf1d0d43453..2dc027987bb6 100644
--- third_party/libwebrtc/video/config/encoder_config_gn/moz.build
+++ third_party/libwebrtc/video/config/encoder_config_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -92241,7 +92661,7 @@ index ea2b54bfb866..2dc027987bb6 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92306,6 +92726,7 @@ index ea2b54bfb866..2dc027987bb6 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -92432,7 +92853,7 @@ index ea2b54bfb866..2dc027987bb6 100644
Library("encoder_config_gn")
diff --git third_party/libwebrtc/video/config/streams_config_gn/moz.build third_party/libwebrtc/video/config/streams_config_gn/moz.build
-index 9e174cff3ccb..3ab1b0d83805 100644
+index ee7c9fa2821e..3ab1b0d83805 100644
--- third_party/libwebrtc/video/config/streams_config_gn/moz.build
+++ third_party/libwebrtc/video/config/streams_config_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -92456,7 +92877,7 @@ index 9e174cff3ccb..3ab1b0d83805 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,192 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92526,6 +92947,7 @@ index 9e174cff3ccb..3ab1b0d83805 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -92655,7 +93077,7 @@ index 9e174cff3ccb..3ab1b0d83805 100644
Library("streams_config_gn")
diff --git third_party/libwebrtc/video/decode_synchronizer_gn/moz.build third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
-index de01a944eadc..f306e996bb22 100644
+index 24c8dd050bb2..f306e996bb22 100644
--- third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
+++ third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -92679,7 +93101,7 @@ index de01a944eadc..f306e996bb22 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92748,6 +93170,7 @@ index de01a944eadc..f306e996bb22 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -92877,7 +93300,7 @@ index de01a944eadc..f306e996bb22 100644
Library("decode_synchronizer_gn")
diff --git third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
-index 2f7abf4617c9..f0eff3beb31c 100644
+index edb6fb124a67..f0eff3beb31c 100644
--- third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
+++ third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -92901,7 +93324,7 @@ index 2f7abf4617c9..f0eff3beb31c 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92970,6 +93393,7 @@ index 2f7abf4617c9..f0eff3beb31c 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -93099,7 +93523,7 @@ index 2f7abf4617c9..f0eff3beb31c 100644
Library("frame_cadence_adapter_gn")
diff --git third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
-index 834d9880e79f..b37ca42dd139 100644
+index c84f2344d797..b37ca42dd139 100644
--- third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
+++ third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -93123,7 +93547,7 @@ index 834d9880e79f..b37ca42dd139 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -93192,6 +93616,7 @@ index 834d9880e79f..b37ca42dd139 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -93243,7 +93668,7 @@ index 834d9880e79f..b37ca42dd139 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -161,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -93303,7 +93728,7 @@ index 834d9880e79f..b37ca42dd139 100644
-
Library("frame_decode_scheduler_gn")
diff --git third_party/libwebrtc/video/frame_decode_timing_gn/moz.build third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
-index 570b927d3a81..40d9a4ffcc46 100644
+index b607a50d2ede..40d9a4ffcc46 100644
--- third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
+++ third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -93327,7 +93752,7 @@ index 570b927d3a81..40d9a4ffcc46 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -93396,6 +93821,7 @@ index 570b927d3a81..40d9a4ffcc46 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -93525,7 +93951,7 @@ index 570b927d3a81..40d9a4ffcc46 100644
Library("frame_decode_timing_gn")
diff --git third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
-index 3266e8f07fbf..254d05acd491 100644
+index 0daab97ba9df..254d05acd491 100644
--- third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
+++ third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -93549,7 +93975,7 @@ index 3266e8f07fbf..254d05acd491 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,192 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -93619,6 +94045,7 @@ index 3266e8f07fbf..254d05acd491 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -93748,7 +94175,7 @@ index 3266e8f07fbf..254d05acd491 100644
Library("frame_dumping_decoder_gn")
diff --git third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build
-index c8b8614b0499..42958c3afcef 100644
+index 1dca41a24e5a..42958c3afcef 100644
--- third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build
+++ third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -93772,7 +94199,7 @@ index c8b8614b0499..42958c3afcef 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -93837,6 +94264,7 @@ index c8b8614b0499..42958c3afcef 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -93963,7 +94391,7 @@ index c8b8614b0499..42958c3afcef 100644
Library("incoming_video_stream_gn")
diff --git third_party/libwebrtc/video/render/video_render_frames_gn/moz.build third_party/libwebrtc/video/render/video_render_frames_gn/moz.build
-index 951c654ef6d2..a3b28f438f5d 100644
+index df90ccd36237..a3b28f438f5d 100644
--- third_party/libwebrtc/video/render/video_render_frames_gn/moz.build
+++ third_party/libwebrtc/video/render/video_render_frames_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -93987,7 +94415,7 @@ index 951c654ef6d2..a3b28f438f5d 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -94052,6 +94480,7 @@ index 951c654ef6d2..a3b28f438f5d 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -94178,7 +94607,7 @@ index 951c654ef6d2..a3b28f438f5d 100644
Library("video_render_frames_gn")
diff --git third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build
-index e9e33818dec5..f8bc9184d923 100644
+index d7e53c522132..f8bc9184d923 100644
--- third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build
+++ third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -94202,7 +94631,7 @@ index e9e33818dec5..f8bc9184d923 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -94271,6 +94700,7 @@ index e9e33818dec5..f8bc9184d923 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -94400,7 +94830,7 @@ index e9e33818dec5..f8bc9184d923 100644
Library("task_queue_frame_decode_scheduler_gn")
diff --git third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build
-index de254b0f678e..177b8617949e 100644
+index 153cf2010dd6..177b8617949e 100644
--- third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build
+++ third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -94424,7 +94854,7 @@ index de254b0f678e..177b8617949e 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,176 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -94485,6 +94915,7 @@ index de254b0f678e..177b8617949e 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -94607,7 +95038,7 @@ index de254b0f678e..177b8617949e 100644
Library("unique_timestamp_counter_gn")
diff --git third_party/libwebrtc/video/video_gn/moz.build third_party/libwebrtc/video/video_gn/moz.build
-index 392c0c16c828..c3232b0bd0ff 100644
+index 1231f0b85ba1..bc3828d5acb5 100644
--- third_party/libwebrtc/video/video_gn/moz.build
+++ third_party/libwebrtc/video/video_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -94631,7 +95062,7 @@ index 392c0c16c828..c3232b0bd0ff 100644
FINAL_LIBRARY = "webrtc"
-@@ -64,191 +73,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -63,192 +72,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -94701,6 +95132,7 @@ index 392c0c16c828..c3232b0bd0ff 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -94830,7 +95262,7 @@ index 392c0c16c828..c3232b0bd0ff 100644
Library("video_gn")
diff --git third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build
-index 0de224d0dfb5..b74708587cec 100644
+index 2f32d659ef6e..b74708587cec 100644
--- third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build
+++ third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -94854,7 +95286,7 @@ index 0de224d0dfb5..b74708587cec 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -94923,6 +95355,7 @@ index 0de224d0dfb5..b74708587cec 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -95052,7 +95485,7 @@ index 0de224d0dfb5..b74708587cec 100644
Library("video_receive_stream_timeout_tracker_gn")
diff --git third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build
-index a18b990a8d75..8b1e03633a54 100644
+index 943bb13ea2cd..8b1e03633a54 100644
--- third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build
+++ third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -95076,7 +95509,7 @@ index a18b990a8d75..8b1e03633a54 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,192 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -95146,6 +95579,7 @@ index a18b990a8d75..8b1e03633a54 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -95275,7 +95709,7 @@ index a18b990a8d75..8b1e03633a54 100644
Library("video_stream_buffer_controller_gn")
diff --git third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
-index cd70bcde35e5..004e04207c71 100644
+index 7d5d6179e612..004e04207c71 100644
--- third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
+++ third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -95299,7 +95733,7 @@ index cd70bcde35e5..004e04207c71 100644
FINAL_LIBRARY = "webrtc"
-@@ -48,191 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,192 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -95369,6 +95803,7 @@ index cd70bcde35e5..004e04207c71 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -95498,7 +95933,7 @@ index cd70bcde35e5..004e04207c71 100644
Library("video_stream_encoder_impl_gn")
diff --git third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build
-index e058513d4fb8..d51109a08c5f 100644
+index 9fd417f96be9..d51109a08c5f 100644
--- third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build
+++ third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -95522,7 +95957,7 @@ index e058513d4fb8..d51109a08c5f 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -95587,6 +96022,7 @@ index e058513d4fb8..d51109a08c5f 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -95635,7 +96071,7 @@ index e058513d4fb8..d51109a08c5f 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -154,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -95695,7 +96131,7 @@ index e058513d4fb8..d51109a08c5f 100644
-
Library("video_stream_encoder_interface_gn")
diff --git third_party/libwebrtc/webrtc_gn/moz.build third_party/libwebrtc/webrtc_gn/moz.build
-index b91e518cabc7..495fb5b35f3d 100644
+index 7e3ac4033b69..495fb5b35f3d 100644
--- third_party/libwebrtc/webrtc_gn/moz.build
+++ third_party/libwebrtc/webrtc_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -95719,7 +96155,7 @@ index b91e518cabc7..495fb5b35f3d 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,139 +48,23 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,141 +48,23 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -95805,6 +96241,7 @@ index b91e518cabc7..495fb5b35f3d 100644
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
@@ -95828,6 +96265,7 @@ index b91e518cabc7..495fb5b35f3d 100644
- OS_LIBS += [
- "crypt32",
- "d3d11",
+- "dwmapi",
- "dxgi",
- "iphlpapi",
- "ole32",
@@ -95864,7 +96302,7 @@ index b91e518cabc7..495fb5b35f3d 100644
LOCAL_INCLUDES += [
"/third_party/pipewire/"
-@@ -180,7 +73,6 @@ if CONFIG["CPU_ARCH"] == "mips32":
+@@ -182,7 +73,6 @@ if CONFIG["CPU_ARCH"] == "mips32":
if CONFIG["CPU_ARCH"] == "mips64":
DEFINES["WEBRTC_USE_PIPEWIRE"] = True
@@ -95872,7 +96310,7 @@ index b91e518cabc7..495fb5b35f3d 100644
LOCAL_INCLUDES += [
"/third_party/pipewire/"
-@@ -189,32 +81,22 @@ if CONFIG["CPU_ARCH"] == "mips64":
+@@ -191,32 +81,22 @@ if CONFIG["CPU_ARCH"] == "mips64":
if CONFIG["CPU_ARCH"] == "x86":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -95915,7 +96353,7 @@ index b91e518cabc7..495fb5b35f3d 100644
DEFINES["USE_X11"] = "1"
-@@ -229,53 +111,4 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+@@ -231,53 +111,4 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
"Xtst"
]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-27 00:45:24 +0000