aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/agate/Makefile3
-rw-r--r--www/agate/Makefile.crates158
-rw-r--r--www/agate/distinfo322
-rw-r--r--www/angie-module-cache-purge/Makefile4
-rw-r--r--www/angie/distinfo6
-rw-r--r--www/baikal/Makefile2
-rw-r--r--www/baikal/distinfo6
-rw-r--r--www/baikal/pkg-plist70
-rw-r--r--www/chromium/Makefile2
-rw-r--r--www/chromium/distinfo10
-rw-r--r--www/chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc12
-rw-r--r--www/chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h10
-rw-r--r--www/chromium/files/patch-components_autofill_core_browser_suggestions_payments_payments__suggestion__generator.cc11
-rw-r--r--www/dpp/Makefile1
-rw-r--r--www/firefox-esr/Makefile2
-rw-r--r--www/firefox-esr/distinfo6
-rw-r--r--www/firefox-esr/files/patch-bug126965434
-rw-r--r--www/firefox-esr/files/patch-bug1269654_comment543
-rw-r--r--www/firefox/Makefile6
-rw-r--r--www/firefox/distinfo6
-rw-r--r--www/firefox/files/patch-bug126965434
-rw-r--r--www/firefox/files/patch-bug1269654_comment543
-rw-r--r--www/firefox/files/patch-libwebrtc-generated21063
-rw-r--r--www/firefox/files/patch-python_sites_mach.txt12
-rw-r--r--www/freenginx-devel/Makefile2
-rw-r--r--www/freenginx-devel/Makefile.extmod2
-rw-r--r--www/freenginx-devel/distinfo6
-rw-r--r--www/freenginx/Makefile2
-rw-r--r--www/freenginx/Makefile.extmod4
-rw-r--r--www/freenginx/distinfo10
-rw-r--r--www/garage/Makefile2
-rw-r--r--www/glpi/Makefile1
-rw-r--r--www/gohugo/Makefile2
-rw-r--r--www/gohugo/distinfo10
-rw-r--r--www/iridium/Makefile2
-rw-r--r--www/iridium/distinfo6
-rw-r--r--www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc12
-rw-r--r--www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h10
-rw-r--r--www/iridium/files/patch-components_autofill_core_browser_suggestions_payments_payments__suggestion__generator.cc11
-rw-r--r--www/librewolf/Makefile1
-rw-r--r--www/lua-resty-core/Makefile2
-rw-r--r--www/lua-resty-core/distinfo6
-rw-r--r--www/lua-resty-core/pkg-plist1
-rw-r--r--www/lycheeorg/Makefile1
-rw-r--r--www/mod_maxminddb/Makefile2
-rw-r--r--www/mod_maxminddb/distinfo6
-rw-r--r--www/mod_maxminddb/files/patch-src_Makefile.am8
-rw-r--r--www/mod_maxminddb/pkg-message19
-rw-r--r--www/mod_security/Makefile2
-rw-r--r--www/moodle45/Makefile1
-rw-r--r--www/moodle50/Makefile1
-rw-r--r--www/moodle51/Makefile1
-rw-r--r--www/mybb/Makefile6
-rw-r--r--www/mybb/distinfo6
-rw-r--r--www/mybb/pkg-plist5
-rw-r--r--www/nextcloud-appointments/Makefile1
-rw-r--r--www/nextcloud-calendar/Makefile2
-rw-r--r--www/nextcloud-calendar/distinfo6
-rw-r--r--www/nextcloud-contacts/Makefile2
-rw-r--r--www/nextcloud-contacts/distinfo6
-rw-r--r--www/nextcloud-deck/Makefile2
-rw-r--r--www/nextcloud-deck/distinfo6
-rw-r--r--www/nextcloud-forms/Makefile1
-rw-r--r--www/nextcloud-groupfolders/Makefile1
-rw-r--r--www/nextcloud-news/Makefile1
-rw-r--r--www/nextcloud-notes/Makefile1
-rw-r--r--www/nextcloud-tasks/Makefile1
-rw-r--r--www/nextcloud/Makefile1
-rw-r--r--www/nginx-acme/Makefile44
-rw-r--r--www/nginx-acme/distinfo6
-rw-r--r--www/nginx-acme/files/extra-patch-src_conf_order.rs-devel11
-rw-r--r--www/nginx-devel/Makefile2
-rw-r--r--www/nginx-devel/Makefile.extmod2
-rw-r--r--www/nginx-devel/distinfo6
-rw-r--r--www/nginx/Makefile2
-rw-r--r--www/nginx/Makefile.extmod4
-rw-r--r--www/nginx/distinfo10
-rw-r--r--www/onionshare-cli/Makefile2
-rw-r--r--www/piwigo/Makefile2
-rw-r--r--www/pmwiki/Makefile4
-rw-r--r--www/pmwiki/distinfo6
-rw-r--r--www/pmwiki/pkg-plist447
-rw-r--r--www/proxygen/Makefile3
-rw-r--r--www/proxygen/distinfo6
-rw-r--r--www/proxygen/pkg-plist2
-rw-r--r--www/py-aiohttp-session/Makefile2
-rw-r--r--www/py-autobahn/Makefile2
-rw-r--r--www/py-daphne/Makefile2
-rw-r--r--www/py-dj-database-url/Makefile7
-rw-r--r--www/py-dj-database-url/distinfo6
-rw-r--r--www/py-dj52-drf-spectacular-sidecar/Makefile2
-rw-r--r--www/py-dj52-drf-spectacular-sidecar/distinfo6
-rw-r--r--www/py-dj52-social-auth-app-django/Makefile4
-rw-r--r--www/py-dj52-social-auth-app-django/distinfo6
-rw-r--r--www/py-dj52-strawberry-graphql-django/Makefile7
-rw-r--r--www/py-dj52-strawberry-graphql-django/distinfo6
-rw-r--r--www/py-django-bootstrap3/Makefile2
-rw-r--r--www/py-django-bootstrap3/distinfo6
-rw-r--r--www/py-django52/Makefile2
-rw-r--r--www/py-django52/distinfo6
-rw-r--r--www/py-django60/Makefile2
-rw-r--r--www/py-django60/distinfo6
-rw-r--r--www/py-drf-spectacular-sidecar/Makefile2
-rw-r--r--www/py-drf-spectacular-sidecar/distinfo6
-rw-r--r--www/py-fastapi/Makefile5
-rw-r--r--www/py-fastapi/distinfo6
-rw-r--r--www/py-freenit/Makefile2
-rw-r--r--www/py-freenit/distinfo6
-rw-r--r--www/py-mailman-hyperkitty/Makefile1
-rw-r--r--www/py-nikola/Makefile1
-rw-r--r--www/py-notebook/Makefile1
-rw-r--r--www/py-strawberry-graphql-django/Makefile7
-rw-r--r--www/py-strawberry-graphql-django/distinfo6
-rw-r--r--www/reproxy/Makefile5
-rw-r--r--www/reproxy/distinfo6
-rw-r--r--www/sogo/Makefile1
-rw-r--r--www/squid/Makefile2
-rw-r--r--www/squid/files/patch-configure42
-rw-r--r--www/suitecrm/Makefile1
-rw-r--r--www/tor-browser/Makefile1
-rw-r--r--www/tt-rss/Makefile1
-rw-r--r--www/ungoogled-chromium/Makefile2
-rw-r--r--www/ungoogled-chromium/distinfo14
-rw-r--r--www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc12
-rw-r--r--www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h10
-rw-r--r--www/ungoogled-chromium/files/patch-components_autofill_core_browser_suggestions_payments_payments__suggestion__generator.cc11
-rw-r--r--www/varnish-libvmod-dynamic/Makefile1
-rw-r--r--www/waterfox/Makefile1
-rw-r--r--www/web2ldap/Makefile2
129 files changed, 6579 insertions, 16256 deletions
diff --git a/www/agate/Makefile b/www/agate/Makefile
index e100c193cf15..0237105e8713 100644
--- a/www/agate/Makefile
+++ b/www/agate/Makefile
@@ -1,7 +1,6 @@
PORTNAME= agate
DISTVERSIONPREFIX= v
-DISTVERSION= 3.3.19
-PORTREVISION= 3
+DISTVERSION= 3.3.20
CATEGORIES= www
MAINTAINER= alven@FreeBSD.org
diff --git a/www/agate/Makefile.crates b/www/agate/Makefile.crates
index e539a9eb3ef3..c4b42b319625 100644
--- a/www/agate/Makefile.crates
+++ b/www/agate/Makefile.crates
@@ -1,22 +1,25 @@
-CARGO_CRATES= addr2line-0.24.2 \
- adler2-2.0.1 \
- anstream-0.6.19 \
- anstyle-1.0.11 \
+CARGO_CRATES= anstream-0.6.21 \
+ anstyle-1.0.13 \
anstyle-parse-0.2.7 \
- anstyle-query-1.1.3 \
- anstyle-wincon-3.0.9 \
- backtrace-0.3.75 \
- bitflags-2.9.4 \
- bytes-1.10.1 \
- cc-1.2.37 \
- cfg-if-1.0.3 \
+ anstyle-query-1.1.5 \
+ anstyle-wincon-3.0.11 \
+ asn1-rs-0.7.1 \
+ asn1-rs-derive-0.6.0 \
+ asn1-rs-impl-0.2.0 \
+ autocfg-1.5.0 \
+ bitflags-2.10.0 \
+ bytes-1.11.0 \
+ cc-1.2.51 \
+ cfg-if-1.0.4 \
colorchoice-1.0.4 \
configparser-3.1.0 \
- deranged-0.5.3 \
+ data-encoding-2.9.0 \
+ der-parser-10.0.0 \
+ deranged-0.5.5 \
displaydoc-0.2.5 \
- env_filter-0.1.3 \
+ env_filter-0.1.4 \
env_logger-0.11.8 \
- find-msvc-tools-0.1.1 \
+ find-msvc-tools-0.1.6 \
foreign-types-0.3.2 \
foreign-types-shared-0.1.1 \
form_urlencoded-1.2.2 \
@@ -26,101 +29,120 @@ CARGO_CRATES= addr2line-0.24.2 \
futures-util-0.3.31 \
getopts-0.2.24 \
getrandom-0.2.16 \
- gimli-0.31.1 \
glob-0.3.3 \
- icu_collections-2.0.0 \
- icu_locale_core-2.0.0 \
- icu_normalizer-2.0.0 \
- icu_normalizer_data-2.0.0 \
- icu_properties-2.0.1 \
- icu_properties_data-2.0.1 \
- icu_provider-2.0.0 \
+ icu_collections-2.1.1 \
+ icu_locale_core-2.1.1 \
+ icu_normalizer-2.1.1 \
+ icu_normalizer_data-2.1.1 \
+ icu_properties-2.1.2 \
+ icu_properties_data-2.1.2 \
+ icu_provider-2.1.1 \
idna-1.1.0 \
idna_adapter-1.2.1 \
- io-uring-0.7.10 \
- is_terminal_polyfill-1.70.1 \
- jiff-0.2.15 \
- jiff-static-0.2.15 \
- libc-0.2.175 \
- litemap-0.8.0 \
- log-0.4.28 \
- memchr-2.7.5 \
+ is_terminal_polyfill-1.70.2 \
+ itoa-1.0.17 \
+ jiff-0.2.18 \
+ jiff-static-0.2.18 \
+ lazy_static-1.5.0 \
+ libc-0.2.179 \
+ litemap-0.8.1 \
+ log-0.4.29 \
+ memchr-2.7.6 \
mime-0.3.17 \
mime_guess-2.0.5 \
- miniz_oxide-0.8.9 \
- mio-1.0.4 \
+ minimal-lexical-0.2.1 \
+ mio-1.1.1 \
+ nom-7.1.3 \
+ num-bigint-0.4.6 \
num-conv-0.1.0 \
- object-0.36.7 \
+ num-integer-0.1.46 \
+ num-traits-0.2.19 \
+ oid-registry-0.8.1 \
once_cell-1.21.3 \
- once_cell_polyfill-1.70.1 \
- openssl-0.10.73 \
+ once_cell_polyfill-1.70.2 \
+ openssl-0.10.75 \
openssl-macros-0.1.1 \
- openssl-sys-0.9.109 \
+ openssl-sys-0.9.111 \
percent-encoding-2.3.2 \
pin-project-lite-0.2.16 \
pin-utils-0.1.0 \
pkg-config-0.3.32 \
- portable-atomic-1.11.1 \
+ portable-atomic-1.13.0 \
portable-atomic-util-0.2.4 \
- potential_utf-0.1.3 \
+ potential_utf-0.1.4 \
powerfmt-0.2.0 \
- proc-macro2-1.0.101 \
- quote-1.0.40 \
- rcgen-0.14.4 \
+ proc-macro2-1.0.105 \
+ quote-1.0.43 \
+ rcgen-0.14.6 \
ring-0.17.14 \
- rustc-demangle-0.1.26 \
- rustls-0.23.31 \
- rustls-pki-types-1.12.0 \
- rustls-webpki-0.103.6 \
- serde-1.0.225 \
- serde_core-1.0.225 \
- serde_derive-1.0.225 \
+ rusticata-macros-4.1.0 \
+ rustls-0.23.36 \
+ rustls-pki-types-1.13.2 \
+ rustls-webpki-0.103.8 \
+ serde-1.0.228 \
+ serde_core-1.0.228 \
+ serde_derive-1.0.228 \
shlex-1.3.0 \
slab-0.4.11 \
smallvec-1.15.1 \
- socket2-0.6.0 \
- stable_deref_trait-1.2.0 \
+ socket2-0.6.1 \
+ stable_deref_trait-1.2.1 \
subtle-2.6.1 \
- syn-2.0.106 \
+ syn-2.0.113 \
synstructure-0.13.2 \
thiserror-1.0.69 \
+ thiserror-2.0.17 \
thiserror-impl-1.0.69 \
- time-0.3.43 \
+ thiserror-impl-2.0.17 \
+ time-0.3.44 \
time-core-0.1.6 \
- tinystr-0.8.1 \
- tokio-1.47.1 \
- tokio-macros-2.5.0 \
+ time-macros-0.2.24 \
+ tinystr-0.8.2 \
+ tokio-1.49.0 \
+ tokio-macros-2.6.0 \
tokio-openssl-0.6.5 \
- tokio-rustls-0.26.3 \
+ tokio-rustls-0.26.4 \
trotter-1.0.2 \
- unicase-2.8.1 \
- unicode-ident-1.0.19 \
+ unicase-2.9.0 \
+ unicode-ident-1.0.22 \
untrusted-0.9.0 \
- url-2.5.7 \
+ url-2.5.8 \
urlencoding-2.1.3 \
utf8_iter-1.0.4 \
utf8parse-0.2.2 \
vcpkg-0.2.15 \
wasi-0.11.1+wasi-snapshot-preview1 \
- wildmatch-2.5.0 \
+ wildmatch-2.6.1 \
+ windows-link-0.2.1 \
windows-sys-0.52.0 \
- windows-sys-0.59.0 \
+ windows-sys-0.60.2 \
+ windows-sys-0.61.2 \
windows-targets-0.52.6 \
+ windows-targets-0.53.5 \
windows_aarch64_gnullvm-0.52.6 \
+ windows_aarch64_gnullvm-0.53.1 \
windows_aarch64_msvc-0.52.6 \
+ windows_aarch64_msvc-0.53.1 \
windows_i686_gnu-0.52.6 \
+ windows_i686_gnu-0.53.1 \
windows_i686_gnullvm-0.52.6 \
+ windows_i686_gnullvm-0.53.1 \
windows_i686_msvc-0.52.6 \
+ windows_i686_msvc-0.53.1 \
windows_x86_64_gnu-0.52.6 \
+ windows_x86_64_gnu-0.53.1 \
windows_x86_64_gnullvm-0.52.6 \
+ windows_x86_64_gnullvm-0.53.1 \
windows_x86_64_msvc-0.52.6 \
- writeable-0.6.1 \
+ windows_x86_64_msvc-0.53.1 \
+ writeable-0.6.2 \
+ x509-parser-0.18.0 \
yasna-0.5.2 \
- yoke-0.8.0 \
- yoke-derive-0.8.0 \
+ yoke-0.8.1 \
+ yoke-derive-0.8.1 \
zerofrom-0.1.6 \
zerofrom-derive-0.1.6 \
- zeroize-1.8.1 \
- zerotrie-0.2.2 \
- zerovec-0.11.4 \
- zerovec-derive-0.11.1
+ zeroize-1.8.2 \
+ zerotrie-0.2.3 \
+ zerovec-0.11.5 \
+ zerovec-derive-0.11.2
diff --git a/www/agate/distinfo b/www/agate/distinfo
index 032cc9861207..50d8b8bd2768 100644
--- a/www/agate/distinfo
+++ b/www/agate/distinfo
@@ -1,42 +1,48 @@
-TIMESTAMP = 1758277207
-SHA256 (rust/crates/addr2line-0.24.2.crate) = dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1
-SIZE (rust/crates/addr2line-0.24.2.crate) = 39015
-SHA256 (rust/crates/adler2-2.0.1.crate) = 320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa
-SIZE (rust/crates/adler2-2.0.1.crate) = 13366
-SHA256 (rust/crates/anstream-0.6.19.crate) = 301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933
-SIZE (rust/crates/anstream-0.6.19.crate) = 28767
-SHA256 (rust/crates/anstyle-1.0.11.crate) = 862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd
-SIZE (rust/crates/anstyle-1.0.11.crate) = 15880
+TIMESTAMP = 1767788542
+SHA256 (rust/crates/anstream-0.6.21.crate) = 43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a
+SIZE (rust/crates/anstream-0.6.21.crate) = 29516
+SHA256 (rust/crates/anstyle-1.0.13.crate) = 5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78
+SIZE (rust/crates/anstyle-1.0.13.crate) = 17651
SHA256 (rust/crates/anstyle-parse-0.2.7.crate) = 4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2
SIZE (rust/crates/anstyle-parse-0.2.7.crate) = 21707
-SHA256 (rust/crates/anstyle-query-1.1.3.crate) = 6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9
-SIZE (rust/crates/anstyle-query-1.1.3.crate) = 10190
-SHA256 (rust/crates/anstyle-wincon-3.0.9.crate) = 403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882
-SIZE (rust/crates/anstyle-wincon-3.0.9.crate) = 12561
-SHA256 (rust/crates/backtrace-0.3.75.crate) = 6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002
-SIZE (rust/crates/backtrace-0.3.75.crate) = 92665
-SHA256 (rust/crates/bitflags-2.9.4.crate) = 2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394
-SIZE (rust/crates/bitflags-2.9.4.crate) = 47950
-SHA256 (rust/crates/bytes-1.10.1.crate) = d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a
-SIZE (rust/crates/bytes-1.10.1.crate) = 76779
-SHA256 (rust/crates/cc-1.2.37.crate) = 65193589c6404eb80b450d618eaf9a2cafaaafd57ecce47370519ef674a7bd44
-SIZE (rust/crates/cc-1.2.37.crate) = 90111
-SHA256 (rust/crates/cfg-if-1.0.3.crate) = 2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9
-SIZE (rust/crates/cfg-if-1.0.3.crate) = 8719
+SHA256 (rust/crates/anstyle-query-1.1.5.crate) = 40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc
+SIZE (rust/crates/anstyle-query-1.1.5.crate) = 10264
+SHA256 (rust/crates/anstyle-wincon-3.0.11.crate) = 291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d
+SIZE (rust/crates/anstyle-wincon-3.0.11.crate) = 12638
+SHA256 (rust/crates/asn1-rs-0.7.1.crate) = 56624a96882bb8c26d61312ae18cb45868e5a9992ea73c58e45c3101e56a1e60
+SIZE (rust/crates/asn1-rs-0.7.1.crate) = 92118
+SHA256 (rust/crates/asn1-rs-derive-0.6.0.crate) = 3109e49b1e4909e9db6515a30c633684d68cdeaa252f215214cb4fa1a5bfee2c
+SIZE (rust/crates/asn1-rs-derive-0.6.0.crate) = 11337
+SHA256 (rust/crates/asn1-rs-impl-0.2.0.crate) = 7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7
+SIZE (rust/crates/asn1-rs-impl-0.2.0.crate) = 2261
+SHA256 (rust/crates/autocfg-1.5.0.crate) = c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8
+SIZE (rust/crates/autocfg-1.5.0.crate) = 18729
+SHA256 (rust/crates/bitflags-2.10.0.crate) = 812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3
+SIZE (rust/crates/bitflags-2.10.0.crate) = 48427
+SHA256 (rust/crates/bytes-1.11.0.crate) = b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3
+SIZE (rust/crates/bytes-1.11.0.crate) = 78391
+SHA256 (rust/crates/cc-1.2.51.crate) = 7a0aeaff4ff1a90589618835a598e545176939b97874f7abc7851caa0618f203
+SIZE (rust/crates/cc-1.2.51.crate) = 93352
+SHA256 (rust/crates/cfg-if-1.0.4.crate) = 9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801
+SIZE (rust/crates/cfg-if-1.0.4.crate) = 9360
SHA256 (rust/crates/colorchoice-1.0.4.crate) = b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75
SIZE (rust/crates/colorchoice-1.0.4.crate) = 8196
SHA256 (rust/crates/configparser-3.1.0.crate) = e57e3272f0190c3f1584272d613719ba5fc7df7f4942fe542e63d949cf3a649b
SIZE (rust/crates/configparser-3.1.0.crate) = 25473
-SHA256 (rust/crates/deranged-0.5.3.crate) = d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc
-SIZE (rust/crates/deranged-0.5.3.crate) = 24353
+SHA256 (rust/crates/data-encoding-2.9.0.crate) = 2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476
+SIZE (rust/crates/data-encoding-2.9.0.crate) = 21564
+SHA256 (rust/crates/der-parser-10.0.0.crate) = 07da5016415d5a3c4dd39b11ed26f915f52fc4e0dc197d87908bc916e51bc1a6
+SIZE (rust/crates/der-parser-10.0.0.crate) = 66186
+SHA256 (rust/crates/deranged-0.5.5.crate) = ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587
+SIZE (rust/crates/deranged-0.5.5.crate) = 24438
SHA256 (rust/crates/displaydoc-0.2.5.crate) = 97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0
SIZE (rust/crates/displaydoc-0.2.5.crate) = 24219
-SHA256 (rust/crates/env_filter-0.1.3.crate) = 186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0
-SIZE (rust/crates/env_filter-0.1.3.crate) = 15191
+SHA256 (rust/crates/env_filter-0.1.4.crate) = 1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2
+SIZE (rust/crates/env_filter-0.1.4.crate) = 15281
SHA256 (rust/crates/env_logger-0.11.8.crate) = 13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f
SIZE (rust/crates/env_logger-0.11.8.crate) = 32538
-SHA256 (rust/crates/find-msvc-tools-0.1.1.crate) = 7fd99930f64d146689264c637b5af2f0233a933bef0d8570e2526bf9e083192d
-SIZE (rust/crates/find-msvc-tools-0.1.1.crate) = 30228
+SHA256 (rust/crates/find-msvc-tools-0.1.6.crate) = 645cbb3a84e60b7531617d5ae4e57f7e27308f6445f5abf653209ea76dec8dff
+SIZE (rust/crates/find-msvc-tools-0.1.6.crate) = 30978
SHA256 (rust/crates/foreign-types-0.3.2.crate) = f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1
SIZE (rust/crates/foreign-types-0.3.2.crate) = 7504
SHA256 (rust/crates/foreign-types-shared-0.1.1.crate) = 00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b
@@ -55,66 +61,74 @@ SHA256 (rust/crates/getopts-0.2.24.crate) = cfe4fbac503b8d1f88e6676011885f34b717
SIZE (rust/crates/getopts-0.2.24.crate) = 21467
SHA256 (rust/crates/getrandom-0.2.16.crate) = 335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592
SIZE (rust/crates/getrandom-0.2.16.crate) = 40163
-SHA256 (rust/crates/gimli-0.31.1.crate) = 07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f
-SIZE (rust/crates/gimli-0.31.1.crate) = 279515
SHA256 (rust/crates/glob-0.3.3.crate) = 0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280
SIZE (rust/crates/glob-0.3.3.crate) = 22861
-SHA256 (rust/crates/icu_collections-2.0.0.crate) = 200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47
-SIZE (rust/crates/icu_collections-2.0.0.crate) = 83033
-SHA256 (rust/crates/icu_locale_core-2.0.0.crate) = 0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a
-SIZE (rust/crates/icu_locale_core-2.0.0.crate) = 74430
-SHA256 (rust/crates/icu_normalizer-2.0.0.crate) = 436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979
-SIZE (rust/crates/icu_normalizer-2.0.0.crate) = 61543
-SHA256 (rust/crates/icu_normalizer_data-2.0.0.crate) = 00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3
-SIZE (rust/crates/icu_normalizer_data-2.0.0.crate) = 68101
-SHA256 (rust/crates/icu_properties-2.0.1.crate) = 016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b
-SIZE (rust/crates/icu_properties-2.0.1.crate) = 58165
-SHA256 (rust/crates/icu_properties_data-2.0.1.crate) = 298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632
-SIZE (rust/crates/icu_properties_data-2.0.1.crate) = 159735
-SHA256 (rust/crates/icu_provider-2.0.0.crate) = 03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af
-SIZE (rust/crates/icu_provider-2.0.0.crate) = 50966
+SHA256 (rust/crates/icu_collections-2.1.1.crate) = 4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43
+SIZE (rust/crates/icu_collections-2.1.1.crate) = 87233
+SHA256 (rust/crates/icu_locale_core-2.1.1.crate) = edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6
+SIZE (rust/crates/icu_locale_core-2.1.1.crate) = 70876
+SHA256 (rust/crates/icu_normalizer-2.1.1.crate) = 5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599
+SIZE (rust/crates/icu_normalizer-2.1.1.crate) = 67132
+SHA256 (rust/crates/icu_normalizer_data-2.1.1.crate) = 7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a
+SIZE (rust/crates/icu_normalizer_data-2.1.1.crate) = 68649
+SHA256 (rust/crates/icu_properties-2.1.2.crate) = 020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec
+SIZE (rust/crates/icu_properties-2.1.2.crate) = 60136
+SHA256 (rust/crates/icu_properties_data-2.1.2.crate) = 616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af
+SIZE (rust/crates/icu_properties_data-2.1.2.crate) = 163057
+SHA256 (rust/crates/icu_provider-2.1.1.crate) = 85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614
+SIZE (rust/crates/icu_provider-2.1.1.crate) = 50907
SHA256 (rust/crates/idna-1.1.0.crate) = 3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de
SIZE (rust/crates/idna-1.1.0.crate) = 148747
SHA256 (rust/crates/idna_adapter-1.2.1.crate) = 3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344
SIZE (rust/crates/idna_adapter-1.2.1.crate) = 10389
-SHA256 (rust/crates/io-uring-0.7.10.crate) = 046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b
-SIZE (rust/crates/io-uring-0.7.10.crate) = 103070
-SHA256 (rust/crates/is_terminal_polyfill-1.70.1.crate) = 7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf
-SIZE (rust/crates/is_terminal_polyfill-1.70.1.crate) = 7492
-SHA256 (rust/crates/jiff-0.2.15.crate) = be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49
-SIZE (rust/crates/jiff-0.2.15.crate) = 712996
-SHA256 (rust/crates/jiff-static-0.2.15.crate) = 03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4
-SIZE (rust/crates/jiff-static-0.2.15.crate) = 76146
-SHA256 (rust/crates/libc-0.2.175.crate) = 6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543
-SIZE (rust/crates/libc-0.2.175.crate) = 788728
-SHA256 (rust/crates/litemap-0.8.0.crate) = 241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956
-SIZE (rust/crates/litemap-0.8.0.crate) = 34344
-SHA256 (rust/crates/log-0.4.28.crate) = 34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432
-SIZE (rust/crates/log-0.4.28.crate) = 51131
-SHA256 (rust/crates/memchr-2.7.5.crate) = 32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0
-SIZE (rust/crates/memchr-2.7.5.crate) = 97603
+SHA256 (rust/crates/is_terminal_polyfill-1.70.2.crate) = a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695
+SIZE (rust/crates/is_terminal_polyfill-1.70.2.crate) = 7548
+SHA256 (rust/crates/itoa-1.0.17.crate) = 92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2
+SIZE (rust/crates/itoa-1.0.17.crate) = 15905
+SHA256 (rust/crates/jiff-0.2.18.crate) = e67e8da4c49d6d9909fe03361f9b620f58898859f5c7aded68351e85e71ecf50
+SIZE (rust/crates/jiff-0.2.18.crate) = 764726
+SHA256 (rust/crates/jiff-static-0.2.18.crate) = e0c84ee7f197eca9a86c6fd6cb771e55eb991632f15f2bc3ca6ec838929e6e78
+SIZE (rust/crates/jiff-static-0.2.18.crate) = 83381
+SHA256 (rust/crates/lazy_static-1.5.0.crate) = bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe
+SIZE (rust/crates/lazy_static-1.5.0.crate) = 14025
+SHA256 (rust/crates/libc-0.2.179.crate) = c5a2d376baa530d1238d133232d15e239abad80d05838b4b59354e5268af431f
+SIZE (rust/crates/libc-0.2.179.crate) = 810442
+SHA256 (rust/crates/litemap-0.8.1.crate) = 6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77
+SIZE (rust/crates/litemap-0.8.1.crate) = 34172
+SHA256 (rust/crates/log-0.4.29.crate) = 5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897
+SIZE (rust/crates/log-0.4.29.crate) = 51515
+SHA256 (rust/crates/memchr-2.7.6.crate) = f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273
+SIZE (rust/crates/memchr-2.7.6.crate) = 97616
SHA256 (rust/crates/mime-0.3.17.crate) = 6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a
SIZE (rust/crates/mime-0.3.17.crate) = 15712
SHA256 (rust/crates/mime_guess-2.0.5.crate) = f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e
SIZE (rust/crates/mime_guess-2.0.5.crate) = 27166
-SHA256 (rust/crates/miniz_oxide-0.8.9.crate) = 1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316
-SIZE (rust/crates/miniz_oxide-0.8.9.crate) = 67132
-SHA256 (rust/crates/mio-1.0.4.crate) = 78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c
-SIZE (rust/crates/mio-1.0.4.crate) = 104212
+SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a
+SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841
+SHA256 (rust/crates/mio-1.1.1.crate) = a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc
+SIZE (rust/crates/mio-1.1.1.crate) = 105630
+SHA256 (rust/crates/nom-7.1.3.crate) = d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a
+SIZE (rust/crates/nom-7.1.3.crate) = 117570
+SHA256 (rust/crates/num-bigint-0.4.6.crate) = a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9
+SIZE (rust/crates/num-bigint-0.4.6.crate) = 102801
SHA256 (rust/crates/num-conv-0.1.0.crate) = 51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9
SIZE (rust/crates/num-conv-0.1.0.crate) = 7444
-SHA256 (rust/crates/object-0.36.7.crate) = 62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87
-SIZE (rust/crates/object-0.36.7.crate) = 329938
+SHA256 (rust/crates/num-integer-0.1.46.crate) = 7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f
+SIZE (rust/crates/num-integer-0.1.46.crate) = 22331
+SHA256 (rust/crates/num-traits-0.2.19.crate) = 071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841
+SIZE (rust/crates/num-traits-0.2.19.crate) = 51631
+SHA256 (rust/crates/oid-registry-0.8.1.crate) = 12f40cff3dde1b6087cc5d5f5d4d65712f34016a03ed60e9c08dcc392736b5b7
+SIZE (rust/crates/oid-registry-0.8.1.crate) = 16668
SHA256 (rust/crates/once_cell-1.21.3.crate) = 42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d
SIZE (rust/crates/once_cell-1.21.3.crate) = 34534
-SHA256 (rust/crates/once_cell_polyfill-1.70.1.crate) = a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad
-SIZE (rust/crates/once_cell_polyfill-1.70.1.crate) = 7510
-SHA256 (rust/crates/openssl-0.10.73.crate) = 8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8
-SIZE (rust/crates/openssl-0.10.73.crate) = 283994
+SHA256 (rust/crates/once_cell_polyfill-1.70.2.crate) = 384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe
+SIZE (rust/crates/once_cell_polyfill-1.70.2.crate) = 7448
+SHA256 (rust/crates/openssl-0.10.75.crate) = 08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328
+SIZE (rust/crates/openssl-0.10.75.crate) = 288136
SHA256 (rust/crates/openssl-macros-0.1.1.crate) = a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c
SIZE (rust/crates/openssl-macros-0.1.1.crate) = 5601
-SHA256 (rust/crates/openssl-sys-0.9.109.crate) = 90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571
-SIZE (rust/crates/openssl-sys-0.9.109.crate) = 78247
+SHA256 (rust/crates/openssl-sys-0.9.111.crate) = 82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321
+SIZE (rust/crates/openssl-sys-0.9.111.crate) = 80871
SHA256 (rust/crates/percent-encoding-2.3.2.crate) = 9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220
SIZE (rust/crates/percent-encoding-2.3.2.crate) = 11583
SHA256 (rust/crates/pin-project-lite-0.2.16.crate) = 3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b
@@ -123,80 +137,86 @@ SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d
SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580
SHA256 (rust/crates/pkg-config-0.3.32.crate) = 7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c
SIZE (rust/crates/pkg-config-0.3.32.crate) = 21370
-SHA256 (rust/crates/portable-atomic-1.11.1.crate) = f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483
-SIZE (rust/crates/portable-atomic-1.11.1.crate) = 185506
+SHA256 (rust/crates/portable-atomic-1.13.0.crate) = f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950
+SIZE (rust/crates/portable-atomic-1.13.0.crate) = 195086
SHA256 (rust/crates/portable-atomic-util-0.2.4.crate) = d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507
SIZE (rust/crates/portable-atomic-util-0.2.4.crate) = 47043
-SHA256 (rust/crates/potential_utf-0.1.3.crate) = 84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a
-SIZE (rust/crates/potential_utf-0.1.3.crate) = 9698
+SHA256 (rust/crates/potential_utf-0.1.4.crate) = b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77
+SIZE (rust/crates/potential_utf-0.1.4.crate) = 9514
SHA256 (rust/crates/powerfmt-0.2.0.crate) = 439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391
SIZE (rust/crates/powerfmt-0.2.0.crate) = 15165
-SHA256 (rust/crates/proc-macro2-1.0.101.crate) = 89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de
-SIZE (rust/crates/proc-macro2-1.0.101.crate) = 53886
-SHA256 (rust/crates/quote-1.0.40.crate) = 1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d
-SIZE (rust/crates/quote-1.0.40.crate) = 31063
-SHA256 (rust/crates/rcgen-0.14.4.crate) = 4c83367ba62b3f1dbd0f086ede4e5ebfb4713fb234dbbc5807772a31245ff46d
-SIZE (rust/crates/rcgen-0.14.4.crate) = 63856
+SHA256 (rust/crates/proc-macro2-1.0.105.crate) = 535d180e0ecab6268a3e718bb9fd44db66bbbc256257165fc699dadf70d16fe7
+SIZE (rust/crates/proc-macro2-1.0.105.crate) = 60319
+SHA256 (rust/crates/quote-1.0.43.crate) = dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a
+SIZE (rust/crates/quote-1.0.43.crate) = 31587
+SHA256 (rust/crates/rcgen-0.14.6.crate) = 3ec0a99f2de91c3cddc84b37e7db80e4d96b743e05607f647eb236fc0455907f
+SIZE (rust/crates/rcgen-0.14.6.crate) = 64777
SHA256 (rust/crates/ring-0.17.14.crate) = a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7
SIZE (rust/crates/ring-0.17.14.crate) = 1502610
-SHA256 (rust/crates/rustc-demangle-0.1.26.crate) = 56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace
-SIZE (rust/crates/rustc-demangle-0.1.26.crate) = 30340
-SHA256 (rust/crates/rustls-0.23.31.crate) = c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc
-SIZE (rust/crates/rustls-0.23.31.crate) = 371259
-SHA256 (rust/crates/rustls-pki-types-1.12.0.crate) = 229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79
-SIZE (rust/crates/rustls-pki-types-1.12.0.crate) = 64740
-SHA256 (rust/crates/rustls-webpki-0.103.6.crate) = 8572f3c2cb9934231157b45499fc41e1f58c589fdfb81a844ba873265e80f8eb
-SIZE (rust/crates/rustls-webpki-0.103.6.crate) = 85224
-SHA256 (rust/crates/serde-1.0.225.crate) = fd6c24dee235d0da097043389623fb913daddf92c76e9f5a1db88607a0bcbd1d
-SIZE (rust/crates/serde-1.0.225.crate) = 28467
-SHA256 (rust/crates/serde_core-1.0.225.crate) = 659356f9a0cb1e529b24c01e43ad2bdf520ec4ceaf83047b83ddcc2251f96383
-SIZE (rust/crates/serde_core-1.0.225.crate) = 63004
-SHA256 (rust/crates/serde_derive-1.0.225.crate) = 0ea936adf78b1f766949a4977b91d2f5595825bd6ec079aa9543ad2685fc4516
-SIZE (rust/crates/serde_derive-1.0.225.crate) = 58560
+SHA256 (rust/crates/rusticata-macros-4.1.0.crate) = faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632
+SIZE (rust/crates/rusticata-macros-4.1.0.crate) = 11746
+SHA256 (rust/crates/rustls-0.23.36.crate) = c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b
+SIZE (rust/crates/rustls-0.23.36.crate) = 374313
+SHA256 (rust/crates/rustls-pki-types-1.13.2.crate) = 21e6f2ab2928ca4291b86736a8bd920a277a399bba1589409d72154ff87c1282
+SIZE (rust/crates/rustls-pki-types-1.13.2.crate) = 34958
+SHA256 (rust/crates/rustls-webpki-0.103.8.crate) = 2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52
+SIZE (rust/crates/rustls-webpki-0.103.8.crate) = 85810
+SHA256 (rust/crates/serde-1.0.228.crate) = 9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e
+SIZE (rust/crates/serde-1.0.228.crate) = 83652
+SHA256 (rust/crates/serde_core-1.0.228.crate) = 41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad
+SIZE (rust/crates/serde_core-1.0.228.crate) = 63111
+SHA256 (rust/crates/serde_derive-1.0.228.crate) = d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79
+SIZE (rust/crates/serde_derive-1.0.228.crate) = 59605
SHA256 (rust/crates/shlex-1.3.0.crate) = 0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64
SIZE (rust/crates/shlex-1.3.0.crate) = 18713
SHA256 (rust/crates/slab-0.4.11.crate) = 7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589
SIZE (rust/crates/slab-0.4.11.crate) = 18549
SHA256 (rust/crates/smallvec-1.15.1.crate) = 67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03
SIZE (rust/crates/smallvec-1.15.1.crate) = 38116
-SHA256 (rust/crates/socket2-0.6.0.crate) = 233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807
-SIZE (rust/crates/socket2-0.6.0.crate) = 57974
-SHA256 (rust/crates/stable_deref_trait-1.2.0.crate) = a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3
-SIZE (rust/crates/stable_deref_trait-1.2.0.crate) = 8054
+SHA256 (rust/crates/socket2-0.6.1.crate) = 17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881
+SIZE (rust/crates/socket2-0.6.1.crate) = 58486
+SHA256 (rust/crates/stable_deref_trait-1.2.1.crate) = 6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596
+SIZE (rust/crates/stable_deref_trait-1.2.1.crate) = 8186
SHA256 (rust/crates/subtle-2.6.1.crate) = 13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292
SIZE (rust/crates/subtle-2.6.1.crate) = 14562
-SHA256 (rust/crates/syn-2.0.106.crate) = ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6
-SIZE (rust/crates/syn-2.0.106.crate) = 301514
+SHA256 (rust/crates/syn-2.0.113.crate) = 678faa00651c9eb72dd2020cbdf275d92eccb2400d568e419efdd64838145cb4
+SIZE (rust/crates/syn-2.0.113.crate) = 304074
SHA256 (rust/crates/synstructure-0.13.2.crate) = 728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2
SIZE (rust/crates/synstructure-0.13.2.crate) = 18950
SHA256 (rust/crates/thiserror-1.0.69.crate) = b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52
SIZE (rust/crates/thiserror-1.0.69.crate) = 22198
+SHA256 (rust/crates/thiserror-2.0.17.crate) = f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8
+SIZE (rust/crates/thiserror-2.0.17.crate) = 28857
SHA256 (rust/crates/thiserror-impl-1.0.69.crate) = 4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1
SIZE (rust/crates/thiserror-impl-1.0.69.crate) = 18365
-SHA256 (rust/crates/time-0.3.43.crate) = 83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031
-SIZE (rust/crates/time-0.3.43.crate) = 142912
+SHA256 (rust/crates/thiserror-impl-2.0.17.crate) = 3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913
+SIZE (rust/crates/thiserror-impl-2.0.17.crate) = 21344
+SHA256 (rust/crates/time-0.3.44.crate) = 91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d
+SIZE (rust/crates/time-0.3.44.crate) = 143200
SHA256 (rust/crates/time-core-0.1.6.crate) = 40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b
SIZE (rust/crates/time-core-0.1.6.crate) = 9105
-SHA256 (rust/crates/tinystr-0.8.1.crate) = 5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b
-SIZE (rust/crates/tinystr-0.8.1.crate) = 23333
-SHA256 (rust/crates/tokio-1.47.1.crate) = 89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038
-SIZE (rust/crates/tokio-1.47.1.crate) = 829790
-SHA256 (rust/crates/tokio-macros-2.5.0.crate) = 6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8
-SIZE (rust/crates/tokio-macros-2.5.0.crate) = 12617
+SHA256 (rust/crates/time-macros-0.2.24.crate) = 30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3
+SIZE (rust/crates/time-macros-0.2.24.crate) = 24715
+SHA256 (rust/crates/tinystr-0.8.2.crate) = 42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869
+SIZE (rust/crates/tinystr-0.8.2.crate) = 23942
+SHA256 (rust/crates/tokio-1.49.0.crate) = 72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86
+SIZE (rust/crates/tokio-1.49.0.crate) = 857029
+SHA256 (rust/crates/tokio-macros-2.6.0.crate) = af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5
+SIZE (rust/crates/tokio-macros-2.6.0.crate) = 16505
SHA256 (rust/crates/tokio-openssl-0.6.5.crate) = 59df6849caa43bb7567f9a36f863c447d95a11d5903c9cc334ba32576a27eadd
SIZE (rust/crates/tokio-openssl-0.6.5.crate) = 11977
-SHA256 (rust/crates/tokio-rustls-0.26.3.crate) = 05f63835928ca123f1bef57abbcd23bb2ba0ac9ae1235f1e65bda0d06e7786bd
-SIZE (rust/crates/tokio-rustls-0.26.3.crate) = 35073
+SHA256 (rust/crates/tokio-rustls-0.26.4.crate) = 1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61
+SIZE (rust/crates/tokio-rustls-0.26.4.crate) = 35430
SHA256 (rust/crates/trotter-1.0.2.crate) = 7c56b8c42904fdee43b91307a67e32aba961eca95e8887d5157b912a61d4f391
SIZE (rust/crates/trotter-1.0.2.crate) = 32314
-SHA256 (rust/crates/unicase-2.8.1.crate) = 75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539
-SIZE (rust/crates/unicase-2.8.1.crate) = 24088
-SHA256 (rust/crates/unicode-ident-1.0.19.crate) = f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d
-SIZE (rust/crates/unicode-ident-1.0.19.crate) = 47480
+SHA256 (rust/crates/unicase-2.9.0.crate) = dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142
+SIZE (rust/crates/unicase-2.9.0.crate) = 24368
+SHA256 (rust/crates/unicode-ident-1.0.22.crate) = 9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5
+SIZE (rust/crates/unicode-ident-1.0.22.crate) = 47919
SHA256 (rust/crates/untrusted-0.9.0.crate) = 8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1
SIZE (rust/crates/untrusted-0.9.0.crate) = 14447
-SHA256 (rust/crates/url-2.5.7.crate) = 08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b
-SIZE (rust/crates/url-2.5.7.crate) = 87907
+SHA256 (rust/crates/url-2.5.8.crate) = ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed
+SIZE (rust/crates/url-2.5.8.crate) = 86512
SHA256 (rust/crates/urlencoding-2.1.3.crate) = daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da
SIZE (rust/crates/urlencoding-2.1.3.crate) = 6538
SHA256 (rust/crates/utf8_iter-1.0.4.crate) = b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be
@@ -207,49 +227,73 @@ SHA256 (rust/crates/vcpkg-0.2.15.crate) = accd4ea62f7bb7a82fe23066fb0957d48ef677
SIZE (rust/crates/vcpkg-0.2.15.crate) = 228735
SHA256 (rust/crates/wasi-0.11.1+wasi-snapshot-preview1.crate) = ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b
SIZE (rust/crates/wasi-0.11.1+wasi-snapshot-preview1.crate) = 28477
-SHA256 (rust/crates/wildmatch-2.5.0.crate) = 39b7d07a236abaef6607536ccfaf19b396dbe3f5110ddb73d39f4562902ed382
-SIZE (rust/crates/wildmatch-2.5.0.crate) = 12562
+SHA256 (rust/crates/wildmatch-2.6.1.crate) = 29333c3ea1ba8b17211763463ff24ee84e41c78224c16b001cd907e663a38c68
+SIZE (rust/crates/wildmatch-2.6.1.crate) = 12798
+SHA256 (rust/crates/windows-link-0.2.1.crate) = f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5
+SIZE (rust/crates/windows-link-0.2.1.crate) = 6133
SHA256 (rust/crates/windows-sys-0.52.0.crate) = 282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d
SIZE (rust/crates/windows-sys-0.52.0.crate) = 2576877
-SHA256 (rust/crates/windows-sys-0.59.0.crate) = 1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b
-SIZE (rust/crates/windows-sys-0.59.0.crate) = 2387323
+SHA256 (rust/crates/windows-sys-0.60.2.crate) = f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb
+SIZE (rust/crates/windows-sys-0.60.2.crate) = 2518479
+SHA256 (rust/crates/windows-sys-0.61.2.crate) = ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc
+SIZE (rust/crates/windows-sys-0.61.2.crate) = 2517186
SHA256 (rust/crates/windows-targets-0.52.6.crate) = 9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973
SIZE (rust/crates/windows-targets-0.52.6.crate) = 6403
+SHA256 (rust/crates/windows-targets-0.53.5.crate) = 4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3
+SIZE (rust/crates/windows-targets-0.53.5.crate) = 7126
SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.6.crate) = 32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3
SIZE (rust/crates/windows_aarch64_gnullvm-0.52.6.crate) = 435718
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.53.1.crate) = a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53
+SIZE (rust/crates/windows_aarch64_gnullvm-0.53.1.crate) = 787748
SHA256 (rust/crates/windows_aarch64_msvc-0.52.6.crate) = 09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469
SIZE (rust/crates/windows_aarch64_msvc-0.52.6.crate) = 832615
+SHA256 (rust/crates/windows_aarch64_msvc-0.53.1.crate) = b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006
+SIZE (rust/crates/windows_aarch64_msvc-0.53.1.crate) = 838009
SHA256 (rust/crates/windows_i686_gnu-0.52.6.crate) = 8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b
SIZE (rust/crates/windows_i686_gnu-0.52.6.crate) = 880402
+SHA256 (rust/crates/windows_i686_gnu-0.53.1.crate) = 960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3
+SIZE (rust/crates/windows_i686_gnu-0.53.1.crate) = 939775
SHA256 (rust/crates/windows_i686_gnullvm-0.52.6.crate) = 0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66
SIZE (rust/crates/windows_i686_gnullvm-0.52.6.crate) = 475940
+SHA256 (rust/crates/windows_i686_gnullvm-0.53.1.crate) = fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c
+SIZE (rust/crates/windows_i686_gnullvm-0.53.1.crate) = 857396
SHA256 (rust/crates/windows_i686_msvc-0.52.6.crate) = 240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66
SIZE (rust/crates/windows_i686_msvc-0.52.6.crate) = 901163
+SHA256 (rust/crates/windows_i686_msvc-0.53.1.crate) = 1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2
+SIZE (rust/crates/windows_i686_msvc-0.53.1.crate) = 907688
SHA256 (rust/crates/windows_x86_64_gnu-0.52.6.crate) = 147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78
SIZE (rust/crates/windows_x86_64_gnu-0.52.6.crate) = 836363
+SHA256 (rust/crates/windows_x86_64_gnu-0.53.1.crate) = 9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499
+SIZE (rust/crates/windows_x86_64_gnu-0.53.1.crate) = 903712
SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d
SIZE (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 435707
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.53.1.crate) = 0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1
+SIZE (rust/crates/windows_x86_64_gnullvm-0.53.1.crate) = 787739
SHA256 (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec
SIZE (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 832564
-SHA256 (rust/crates/writeable-0.6.1.crate) = ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb
-SIZE (rust/crates/writeable-0.6.1.crate) = 24068
+SHA256 (rust/crates/windows_x86_64_msvc-0.53.1.crate) = d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650
+SIZE (rust/crates/windows_x86_64_msvc-0.53.1.crate) = 837950
+SHA256 (rust/crates/writeable-0.6.2.crate) = 9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9
+SIZE (rust/crates/writeable-0.6.2.crate) = 25181
+SHA256 (rust/crates/x509-parser-0.18.0.crate) = eb3e137310115a65136898d2079f003ce33331a6c4b0d51f1531d1be082b6425
+SIZE (rust/crates/x509-parser-0.18.0.crate) = 102525
SHA256 (rust/crates/yasna-0.5.2.crate) = e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd
SIZE (rust/crates/yasna-0.5.2.crate) = 34859
-SHA256 (rust/crates/yoke-0.8.0.crate) = 5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc
-SIZE (rust/crates/yoke-0.8.0.crate) = 28726
-SHA256 (rust/crates/yoke-derive-0.8.0.crate) = 38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6
-SIZE (rust/crates/yoke-derive-0.8.0.crate) = 7521
+SHA256 (rust/crates/yoke-0.8.1.crate) = 72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954
+SIZE (rust/crates/yoke-0.8.1.crate) = 32016
+SHA256 (rust/crates/yoke-derive-0.8.1.crate) = b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d
+SIZE (rust/crates/yoke-derive-0.8.1.crate) = 7593
SHA256 (rust/crates/zerofrom-0.1.6.crate) = 50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5
SIZE (rust/crates/zerofrom-0.1.6.crate) = 5669
SHA256 (rust/crates/zerofrom-derive-0.1.6.crate) = d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502
SIZE (rust/crates/zerofrom-derive-0.1.6.crate) = 8305
-SHA256 (rust/crates/zeroize-1.8.1.crate) = ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde
-SIZE (rust/crates/zeroize-1.8.1.crate) = 20029
-SHA256 (rust/crates/zerotrie-0.2.2.crate) = 36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595
-SIZE (rust/crates/zerotrie-0.2.2.crate) = 74423
-SHA256 (rust/crates/zerovec-0.11.4.crate) = e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b
-SIZE (rust/crates/zerovec-0.11.4.crate) = 125080
-SHA256 (rust/crates/zerovec-derive-0.11.1.crate) = 5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f
-SIZE (rust/crates/zerovec-derive-0.11.1.crate) = 21294
-SHA256 (mbrubeck-agate-v3.3.19_GH0.tar.gz) = b820b56463bcc335e57c565c23db3aa4f8dc06f3131a5d7ce77407fe783fd3be
-SIZE (mbrubeck-agate-v3.3.19_GH0.tar.gz) = 85476
+SHA256 (rust/crates/zeroize-1.8.2.crate) = b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0
+SIZE (rust/crates/zeroize-1.8.2.crate) = 20907
+SHA256 (rust/crates/zerotrie-0.2.3.crate) = 2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851
+SIZE (rust/crates/zerotrie-0.2.3.crate) = 69547
+SHA256 (rust/crates/zerovec-0.11.5.crate) = 6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002
+SIZE (rust/crates/zerovec-0.11.5.crate) = 119620
+SHA256 (rust/crates/zerovec-derive-0.11.2.crate) = eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3
+SIZE (rust/crates/zerovec-derive-0.11.2.crate) = 21421
+SHA256 (mbrubeck-agate-v3.3.20_GH0.tar.gz) = c5e98b4a93c24776b914983c9dc1c1e653fc443430106cd517cf586433b191a8
+SIZE (mbrubeck-agate-v3.3.20_GH0.tar.gz) = 86464
diff --git a/www/angie-module-cache-purge/Makefile b/www/angie-module-cache-purge/Makefile
index 821a320200ca..ee49fc174c10 100644
--- a/www/angie-module-cache-purge/Makefile
+++ b/www/angie-module-cache-purge/Makefile
@@ -1,6 +1,6 @@
PORTNAME= angie-module-cache-purge
-MODULE_VERSION= 2.5.4
-MODULE_PORTREVISION= 1
+MODULE_VERSION= 2.5.5
+MODULE_PORTREVISION= 0
GH_TUPLE= nginx-modules:ngx_cache_purge:${MODULE_VERSION}:module
COMMENT= Angie cache_purge dynamic module
diff --git a/www/angie/distinfo b/www/angie/distinfo
index 172a53b6836a..04e9adb098bc 100644
--- a/www/angie/distinfo
+++ b/www/angie/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1767124788
+TIMESTAMP = 1767777777
SHA256 (angie-1.11.1.tar.gz) = 2ddbe707adca14875e3a128d988466346d0406b60a72ee197038538b4a6f90f2
SIZE (angie-1.11.1.tar.gz) = 1881648
SHA256 (61131-nginx-http-auth-totp-1.1.0_GH0.tar.gz) = d36d2b75a3b239e63ec060ef9ccfa6b89acbceb74b7c93e47550c1f75ac4857e
@@ -9,8 +9,8 @@ SHA256 (stnoonan-spnego-http-auth-nginx-module-v1.1.3_GH0.tar.gz) = 0e1e54f8ab7d
SIZE (stnoonan-spnego-http-auth-nginx-module-v1.1.3_GH0.tar.gz) = 32975
SHA256 (google-ngx_brotli-v1.0.0rc_GH0.tar.gz) = c85cdcfd76703c95aa4204ee4c2e619aa5b075cac18f428202f65552104add3b
SIZE (google-ngx_brotli-v1.0.0rc_GH0.tar.gz) = 16207
-SHA256 (nginx-modules-ngx_cache_purge-2.5.4_GH0.tar.gz) = 5bd04373d818b1aa0f3ba0b31b54149207a17815b026f222c537daf587b0cbda
-SIZE (nginx-modules-ngx_cache_purge-2.5.4_GH0.tar.gz) = 17174
+SHA256 (nginx-modules-ngx_cache_purge-2.5.5_GH0.tar.gz) = 93068d9c5a2a6ebe4966b763cb0033bb5d065210ab96290acc6bf8275625a0a6
+SIZE (nginx-modules-ngx_cache_purge-2.5.5_GH0.tar.gz) = 17299
SHA256 (arut-nginx-dav-ext-module-v3.0.0_GH0.tar.gz) = d2499d94d82d4e4eac8425d799e52883131ae86a956524040ff2fd230ef9f859
SIZE (arut-nginx-dav-ext-module-v3.0.0_GH0.tar.gz) = 14558
SHA256 (openresty-echo-nginx-module-v0.64_GH0.tar.gz) = 6f43f56d7e7e8526716bbda06b300f0119912eede47b3a48bb948252a1fb38c8
diff --git a/www/baikal/Makefile b/www/baikal/Makefile
index 122dcb03372f..83619aec58df 100644
--- a/www/baikal/Makefile
+++ b/www/baikal/Makefile
@@ -1,5 +1,5 @@
PORTNAME= baikal
-PORTVERSION= 0.10.1
+PORTVERSION= 0.11.1
PORTREVISION= 0
CATEGORIES= www
MASTER_SITES= https://github.com/fruux/Baikal/releases/download/${PORTVERSION}/
diff --git a/www/baikal/distinfo b/www/baikal/distinfo
index 0b63b9d28e8c..098b4f0f3510 100644
--- a/www/baikal/distinfo
+++ b/www/baikal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1734016439
-SHA256 (baikal-0.10.1.zip) = 56eb176d98e68ada5af408beb10ffd97bd09c6b6ee59a398dbceff0be19f4df3
-SIZE (baikal-0.10.1.zip) = 2857336
+TIMESTAMP = 1767561345
+SHA256 (baikal-0.11.1.zip) = 124a83adfdd29b7a2b48ce42ffcbdd39906ea0980bb98f79c8479b4a80647100
+SIZE (baikal-0.11.1.zip) = 2912380
diff --git a/www/baikal/pkg-plist b/www/baikal/pkg-plist
index 8fe56efbad9a..42d89794cfa5 100644
--- a/www/baikal/pkg-plist
+++ b/www/baikal/pkg-plist
@@ -746,13 +746,6 @@
%%WWWDIR%%/vendor/symfony/polyfill-mbstring/bootstrap.php
%%WWWDIR%%/vendor/symfony/polyfill-mbstring/bootstrap80.php
%%WWWDIR%%/vendor/symfony/polyfill-mbstring/composer.json
-%%WWWDIR%%/vendor/symfony/polyfill-php81/LICENSE
-%%WWWDIR%%/vendor/symfony/polyfill-php81/Php81.php
-%%WWWDIR%%/vendor/symfony/polyfill-php81/README.md
-%%WWWDIR%%/vendor/symfony/polyfill-php81/Resources/stubs/CURLStringFile.php
-%%WWWDIR%%/vendor/symfony/polyfill-php81/Resources/stubs/ReturnTypeWillChange.php
-%%WWWDIR%%/vendor/symfony/polyfill-php81/bootstrap.php
-%%WWWDIR%%/vendor/symfony/polyfill-php81/composer.json
%%WWWDIR%%/vendor/symfony/yaml/CHANGELOG.md
%%WWWDIR%%/vendor/symfony/yaml/Command/LintCommand.php
%%WWWDIR%%/vendor/symfony/yaml/Dumper.php
@@ -774,7 +767,12 @@
%%WWWDIR%%/vendor/twig/twig/LICENSE
%%WWWDIR%%/vendor/twig/twig/README.rst
%%WWWDIR%%/vendor/twig/twig/composer.json
+%%WWWDIR%%/vendor/twig/twig/phpstan-baseline.neon
+%%WWWDIR%%/vendor/twig/twig/phpstan.neon.dist
%%WWWDIR%%/vendor/twig/twig/src/AbstractTwigCallable.php
+%%WWWDIR%%/vendor/twig/twig/src/Attribute/AsTwigFilter.php
+%%WWWDIR%%/vendor/twig/twig/src/Attribute/AsTwigFunction.php
+%%WWWDIR%%/vendor/twig/twig/src/Attribute/AsTwigTest.php
%%WWWDIR%%/vendor/twig/twig/src/Attribute/FirstClassTwigCallableReady.php
%%WWWDIR%%/vendor/twig/twig/src/Attribute/YieldReady.php
%%WWWDIR%%/vendor/twig/twig/src/Cache/CacheInterface.php
@@ -782,19 +780,45 @@
%%WWWDIR%%/vendor/twig/twig/src/Cache/FilesystemCache.php
%%WWWDIR%%/vendor/twig/twig/src/Cache/NullCache.php
%%WWWDIR%%/vendor/twig/twig/src/Cache/ReadOnlyFilesystemCache.php
+%%WWWDIR%%/vendor/twig/twig/src/Cache/RemovableCacheInterface.php
%%WWWDIR%%/vendor/twig/twig/src/Compiler.php
+%%WWWDIR%%/vendor/twig/twig/src/DeprecatedCallableInfo.php
%%WWWDIR%%/vendor/twig/twig/src/Environment.php
%%WWWDIR%%/vendor/twig/twig/src/Error/Error.php
%%WWWDIR%%/vendor/twig/twig/src/Error/LoaderError.php
%%WWWDIR%%/vendor/twig/twig/src/Error/RuntimeError.php
%%WWWDIR%%/vendor/twig/twig/src/Error/SyntaxError.php
%%WWWDIR%%/vendor/twig/twig/src/ExpressionParser.php
+%%WWWDIR%%/vendor/twig/twig/src/ExpressionParser/AbstractExpressionParser.php
+%%WWWDIR%%/vendor/twig/twig/src/ExpressionParser/ExpressionParserDescriptionInterface.php
+%%WWWDIR%%/vendor/twig/twig/src/ExpressionParser/ExpressionParserInterface.php
+%%WWWDIR%%/vendor/twig/twig/src/ExpressionParser/ExpressionParserType.php
+%%WWWDIR%%/vendor/twig/twig/src/ExpressionParser/ExpressionParsers.php
+%%WWWDIR%%/vendor/twig/twig/src/ExpressionParser/Infix/ArgumentsTrait.php
+%%WWWDIR%%/vendor/twig/twig/src/ExpressionParser/Infix/ArrowExpressionParser.php
+%%WWWDIR%%/vendor/twig/twig/src/ExpressionParser/Infix/BinaryOperatorExpressionParser.php
+%%WWWDIR%%/vendor/twig/twig/src/ExpressionParser/Infix/ConditionalTernaryExpressionParser.php
+%%WWWDIR%%/vendor/twig/twig/src/ExpressionParser/Infix/DotExpressionParser.php
+%%WWWDIR%%/vendor/twig/twig/src/ExpressionParser/Infix/FilterExpressionParser.php
+%%WWWDIR%%/vendor/twig/twig/src/ExpressionParser/Infix/FunctionExpressionParser.php
+%%WWWDIR%%/vendor/twig/twig/src/ExpressionParser/Infix/IsExpressionParser.php
+%%WWWDIR%%/vendor/twig/twig/src/ExpressionParser/Infix/IsNotExpressionParser.php
+%%WWWDIR%%/vendor/twig/twig/src/ExpressionParser/Infix/SquareBracketExpressionParser.php
+%%WWWDIR%%/vendor/twig/twig/src/ExpressionParser/InfixAssociativity.php
+%%WWWDIR%%/vendor/twig/twig/src/ExpressionParser/InfixExpressionParserInterface.php
+%%WWWDIR%%/vendor/twig/twig/src/ExpressionParser/PrecedenceChange.php
+%%WWWDIR%%/vendor/twig/twig/src/ExpressionParser/Prefix/GroupingExpressionParser.php
+%%WWWDIR%%/vendor/twig/twig/src/ExpressionParser/Prefix/LiteralExpressionParser.php
+%%WWWDIR%%/vendor/twig/twig/src/ExpressionParser/Prefix/UnaryOperatorExpressionParser.php
+%%WWWDIR%%/vendor/twig/twig/src/ExpressionParser/PrefixExpressionParserInterface.php
%%WWWDIR%%/vendor/twig/twig/src/Extension/AbstractExtension.php
+%%WWWDIR%%/vendor/twig/twig/src/Extension/AttributeExtension.php
%%WWWDIR%%/vendor/twig/twig/src/Extension/CoreExtension.php
%%WWWDIR%%/vendor/twig/twig/src/Extension/DebugExtension.php
%%WWWDIR%%/vendor/twig/twig/src/Extension/EscaperExtension.php
%%WWWDIR%%/vendor/twig/twig/src/Extension/ExtensionInterface.php
%%WWWDIR%%/vendor/twig/twig/src/Extension/GlobalsInterface.php
+%%WWWDIR%%/vendor/twig/twig/src/Extension/LastModifiedExtensionInterface.php
%%WWWDIR%%/vendor/twig/twig/src/Extension/OptimizerExtension.php
%%WWWDIR%%/vendor/twig/twig/src/Extension/ProfilerExtension.php
%%WWWDIR%%/vendor/twig/twig/src/Extension/RuntimeExtensionInterface.php
@@ -821,6 +845,7 @@
%%WWWDIR%%/vendor/twig/twig/src/Node/DeprecatedNode.php
%%WWWDIR%%/vendor/twig/twig/src/Node/DoNode.php
%%WWWDIR%%/vendor/twig/twig/src/Node/EmbedNode.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/EmptyNode.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/AbstractExpression.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/ArrayExpression.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/ArrowFunctionExpression.php
@@ -828,11 +853,13 @@
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Binary/AbstractBinary.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Binary/AddBinary.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Binary/AndBinary.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Binary/BinaryInterface.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Binary/BitwiseAndBinary.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Binary/BitwiseOrBinary.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Binary/BitwiseXorBinary.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Binary/ConcatBinary.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Binary/DivBinary.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Binary/ElvisBinary.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Binary/EndsWithBinary.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Binary/EqualBinary.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Binary/FloorDivBinary.php
@@ -848,12 +875,14 @@
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Binary/MulBinary.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Binary/NotEqualBinary.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Binary/NotInBinary.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Binary/NullCoalesceBinary.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Binary/OrBinary.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Binary/PowerBinary.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Binary/RangeBinary.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Binary/SpaceshipBinary.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Binary/StartsWithBinary.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Binary/SubBinary.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Binary/XorBinary.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/BlockReferenceExpression.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/CallExpression.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/ConditionalExpression.php
@@ -863,13 +892,26 @@
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/FilterExpression.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/FunctionExpression.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/FunctionNode/EnumCasesFunction.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/FunctionNode/EnumFunction.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/GetAttrExpression.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/InlinePrint.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/ListExpression.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/MacroReferenceExpression.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/MethodCallExpression.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/NameExpression.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/NullCoalesceExpression.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/OperatorEscapeInterface.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/ParentExpression.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/ReturnArrayInterface.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/ReturnBoolInterface.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/ReturnNumberInterface.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/ReturnPrimitiveTypeInterface.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/ReturnStringInterface.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/SupportDefinedTestDeprecationTrait.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/SupportDefinedTestInterface.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/SupportDefinedTestTrait.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/TempNameExpression.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Ternary/ConditionalTernary.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Test/ConstantTest.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Test/DefinedTest.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Test/DivisiblebyTest.php
@@ -877,13 +919,23 @@
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Test/NullTest.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Test/OddTest.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Test/SameasTest.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Test/TrueTest.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/TestExpression.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Unary/AbstractUnary.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Unary/NegUnary.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Unary/NotUnary.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Unary/PosUnary.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Unary/SpreadUnary.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Unary/StringCastUnary.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Unary/UnaryInterface.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Variable/AssignContextVariable.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Variable/AssignTemplateVariable.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Variable/ContextVariable.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Variable/LocalVariable.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Variable/TemplateVariable.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/VariadicExpression.php
%%WWWDIR%%/vendor/twig/twig/src/Node/FlushNode.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/ForElseNode.php
%%WWWDIR%%/vendor/twig/twig/src/Node/ForLoopNode.php
%%WWWDIR%%/vendor/twig/twig/src/Node/ForNode.php
%%WWWDIR%%/vendor/twig/twig/src/Node/IfNode.php
@@ -895,6 +947,7 @@
%%WWWDIR%%/vendor/twig/twig/src/Node/Node.php
%%WWWDIR%%/vendor/twig/twig/src/Node/NodeCaptureInterface.php
%%WWWDIR%%/vendor/twig/twig/src/Node/NodeOutputInterface.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Nodes.php
%%WWWDIR%%/vendor/twig/twig/src/Node/PrintNode.php
%%WWWDIR%%/vendor/twig/twig/src/Node/SandboxNode.php
%%WWWDIR%%/vendor/twig/twig/src/Node/SetNode.php
@@ -904,12 +957,12 @@
%%WWWDIR%%/vendor/twig/twig/src/NodeTraverser.php
%%WWWDIR%%/vendor/twig/twig/src/NodeVisitor/AbstractNodeVisitor.php
%%WWWDIR%%/vendor/twig/twig/src/NodeVisitor/EscaperNodeVisitor.php
-%%WWWDIR%%/vendor/twig/twig/src/NodeVisitor/MacroAutoImportNodeVisitor.php
%%WWWDIR%%/vendor/twig/twig/src/NodeVisitor/NodeVisitorInterface.php
%%WWWDIR%%/vendor/twig/twig/src/NodeVisitor/OptimizerNodeVisitor.php
%%WWWDIR%%/vendor/twig/twig/src/NodeVisitor/SafeAnalysisNodeVisitor.php
%%WWWDIR%%/vendor/twig/twig/src/NodeVisitor/SandboxNodeVisitor.php
%%WWWDIR%%/vendor/twig/twig/src/NodeVisitor/YieldNotReadyNodeVisitor.php
+%%WWWDIR%%/vendor/twig/twig/src/OperatorPrecedenceChange.php
%%WWWDIR%%/vendor/twig/twig/src/Parser.php
%%WWWDIR%%/vendor/twig/twig/src/Profiler/Dumper/BaseDumper.php
%%WWWDIR%%/vendor/twig/twig/src/Profiler/Dumper/BlackfireDumper.php
@@ -953,6 +1006,7 @@
%%WWWDIR%%/vendor/twig/twig/src/TokenParser/FlushTokenParser.php
%%WWWDIR%%/vendor/twig/twig/src/TokenParser/ForTokenParser.php
%%WWWDIR%%/vendor/twig/twig/src/TokenParser/FromTokenParser.php
+%%WWWDIR%%/vendor/twig/twig/src/TokenParser/GuardTokenParser.php
%%WWWDIR%%/vendor/twig/twig/src/TokenParser/IfTokenParser.php
%%WWWDIR%%/vendor/twig/twig/src/TokenParser/ImportTokenParser.php
%%WWWDIR%%/vendor/twig/twig/src/TokenParser/IncludeTokenParser.php
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 2e03a6d6e80a..cfe282d6f384 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,5 +1,5 @@
PORTNAME= chromium
-PORTVERSION= 143.0.7499.169
+PORTVERSION= 143.0.7499.192
PULSEMV= 16
PULSEV= ${PULSEMV}.1
CATEGORIES= www wayland
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index fd4a01af3eb9..0800248c66b4 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1766182467
-SHA256 (chromium-143.0.7499.169-lite.tar.xz) = 0d03408450e552a1012321b61f5bb6e0f07a7f6e2ef111b519066876c1a5e747
-SIZE (chromium-143.0.7499.169-lite.tar.xz) = 1140789336
+TIMESTAMP = 1767797827
+SHA256 (chromium-143.0.7499.192-lite.tar.xz) = 01b2db3c4b89b96b3b18e889b7ef583ca243dd90d27f46c3c0115d298618501c
+SIZE (chromium-143.0.7499.192-lite.tar.xz) = 1140785448
SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
SIZE (pulseaudio-16.1.tar.gz) = 2763111
-SHA256 (chromium-143.0.7499.169-testdata.tar.xz) = 5b6f7f71ee54fe0ac61730b6f58b4a767b2bd6ff9f646cfbc6cc707d6205851f
-SIZE (chromium-143.0.7499.169-testdata.tar.xz) = 1155268416
+SHA256 (chromium-143.0.7499.192-testdata.tar.xz) = 473e990578e16d3937612859c43ec5c22de8586172b6afe4bf4f63cf5ec062aa
+SIZE (chromium-143.0.7499.192-testdata.tar.xz) = 1155268448
diff --git a/www/chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc
index 6999e5e65164..2ee2b1015e10 100644
--- a/www/chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc
+++ b/www/chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/browser/data_manager/payments/payments_data_manager.cc.orig 2025-12-05 10:12:50 UTC
+--- components/autofill/core/browser/data_manager/payments/payments_data_manager.cc.orig 2026-01-07 14:40:58 UTC
+++ components/autofill/core/browser/data_manager/payments/payments_data_manager.cc
-@@ -480,7 +480,7 @@ void PaymentsDataManager::OnWebDataServiceRequestDone(
+@@ -479,7 +479,7 @@ void PaymentsDataManager::OnWebDataServiceRequestDone(
bool PaymentsDataManager::ShouldShowBnplSettings() const {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
// Check `kAutofillEnableBuyNowPayLater` only if the user has seen a BNPL
// suggestion before, or there are already linked issuers present, to avoid
// unnecessary feature flag checks. The linked issuer check is due to the fact
-@@ -1015,7 +1015,7 @@ void PaymentsDataManager::SetPrefService(PrefService*
+@@ -1014,7 +1014,7 @@ void PaymentsDataManager::SetPrefService(PrefService*
&PaymentsDataManager::OnAutofillPaymentsCardBenefitsPrefChange,
base::Unretained(this)));
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +18,7 @@
pref_registrar_.Add(
prefs::kAutofillBnplEnabled,
base::BindRepeating(&PaymentsDataManager::OnBnplEnabledPrefChange,
-@@ -1089,7 +1089,7 @@ void PaymentsDataManager::SetAutofillHasSeenIban() {
+@@ -1088,7 +1088,7 @@ void PaymentsDataManager::SetAutofillHasSeenIban() {
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +27,7 @@
bool PaymentsDataManager::IsAutofillHasSeenBnplPrefEnabled() const {
return prefs::HasSeenBnpl(pref_service_);
}
-@@ -2140,7 +2140,7 @@ bool PaymentsDataManager::AreEwalletAccountsSupported(
+@@ -2139,7 +2139,7 @@ bool PaymentsDataManager::AreEwalletAccountsSupported(
bool PaymentsDataManager::AreBnplIssuersSupported() const {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -36,7 +36,7 @@
return (app_locale_ == "en-US" || app_locale_ == "en-GB" ||
app_locale_ == "en-CA") &&
GetCountryCodeForExperimentGroup() == "US" &&
-@@ -2175,7 +2175,7 @@ void PaymentsDataManager::ClearAllCreditCardBenefits()
+@@ -2174,7 +2174,7 @@ void PaymentsDataManager::ClearAllCreditCardBenefits()
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h b/www/chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h
index ae6e45119f3b..7342678068fe 100644
--- a/www/chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h
+++ b/www/chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h
@@ -1,15 +1,15 @@
---- components/autofill/core/browser/data_manager/payments/payments_data_manager.h.orig 2025-12-05 10:12:50 UTC
+--- components/autofill/core/browser/data_manager/payments/payments_data_manager.h.orig 2026-01-07 14:40:58 UTC
+++ components/autofill/core/browser/data_manager/payments/payments_data_manager.h
-@@ -378,7 +378,7 @@ class PaymentsDataManager : public AutofillWebDataServ
+@@ -377,7 +377,7 @@ class PaymentsDataManager : public AutofillWebDataServ
+ void SetAutofillHasSeenIban();
- // TODO(crbug.com/430575808): Remove build flags.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
// Returns the value of the kAutofillHasSeenBnpl pref.
- virtual bool IsAutofillHasSeenBnplPrefEnabled() const;
+ bool IsAutofillHasSeenBnplPrefEnabled() const;
-@@ -726,7 +726,7 @@ class PaymentsDataManager : public AutofillWebDataServ
+@@ -725,7 +725,7 @@ class PaymentsDataManager : public AutofillWebDataServ
void ClearAllCreditCardBenefits();
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_autofill_core_browser_suggestions_payments_payments__suggestion__generator.cc b/www/chromium/files/patch-components_autofill_core_browser_suggestions_payments_payments__suggestion__generator.cc
deleted file mode 100644
index 1cc46c3065f3..000000000000
--- a/www/chromium/files/patch-components_autofill_core_browser_suggestions_payments_payments__suggestion__generator.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/autofill/core/browser/suggestions/payments/payments_suggestion_generator.cc.orig 2025-12-05 10:12:50 UTC
-+++ components/autofill/core/browser/suggestions/payments/payments_suggestion_generator.cc
-@@ -1462,7 +1462,7 @@ std::vector<Suggestion> GetCreditCardSuggestionsForTou
- .GetBnplIssuers(),
- /*extracted_amount_in_micros=*/std::nullopt));
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- manager.client()
- .GetPersonalDataManager()
- .payments_data_manager()
diff --git a/www/dpp/Makefile b/www/dpp/Makefile
index 9814d099b5f6..19673671f755 100644
--- a/www/dpp/Makefile
+++ b/www/dpp/Makefile
@@ -1,6 +1,7 @@
PORTNAME= dpp
DISTVERSIONPREFIX= v
DISTVERSION= 10.1.3
+PORTREVISION= 1
CATEGORIES= www devel
#MASTER_SITES= https://github.com/brainboxdotcc/DPP/releases/download/v${DISTVERSION}/
PKGNAMESUFFIX= -discord
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 898c7c931af8..eda11920eda6 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -1,5 +1,5 @@
PORTNAME= firefox
-DISTVERSION= 140.6.0
+DISTVERSION= 140.7.0
PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= www wayland
diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo
index 593b991b1898..6c39ff6a3090 100644
--- a/www/firefox-esr/distinfo
+++ b/www/firefox-esr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1764619757
-SHA256 (firefox-140.6.0esr.source.tar.xz) = 6c35c9ab507521033c8fd49f1b4c85ee158f33ed36f5781a663f116c3d604dc9
-SIZE (firefox-140.6.0esr.source.tar.xz) = 643086844
+TIMESTAMP = 1767737118
+SHA256 (firefox-140.7.0esr.source.tar.xz) = 608a739071726f30236f7100ec5e30e1b8ec342d4e91e715948c287909cb1529
+SIZE (firefox-140.7.0esr.source.tar.xz) = 641146512
diff --git a/www/firefox-esr/files/patch-bug1269654 b/www/firefox-esr/files/patch-bug1269654
new file mode 100644
index 000000000000..9f9265f86bfe
--- /dev/null
+++ b/www/firefox-esr/files/patch-bug1269654
@@ -0,0 +1,34 @@
+commit ff13efe458e7786d8c810342d25a6ba8e90a422b
+Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
+
+ based on BMO 1269654
+
+ : https://bugzilla.mozilla.org/show_bug.cgi?id=1269654#c5
+ : https://bug1269654.bmoattachments.org/attachment.cgi?id=8749234
+ : handle big-endian formats in Cairo format conversions
+ :
+ : HG changeset patch
+ : User Lee Salzman <lsalzman@mozilla.com>
+ : Date 1462463631 14400
+ : Thu May 05 11:53:51 2016 -0400
+ : Node ID 8da374804a09977c8f89af5e6e0cb37cb074595d
+ : Parent 29662e28a9c93ac67ee0b8ddfb65a9f29bbf73f5
+ : handle big-endian formats in Cairo format conversions
+
+diff --git gfx/2d/HelpersCairo.h gfx/2d/HelpersCairo.h
+index a10e01bdd62b..f2007ee189fc 100644
+--- gfx/2d/HelpersCairo.h
++++ gfx/2d/HelpersCairo.h
+@@ -185,7 +185,11 @@ static inline cairo_content_t GfxFormatToCairoContent(SurfaceFormat format) {
+ case SurfaceFormat::A8:
+ return CAIRO_CONTENT_ALPHA;
+ default:
+- gfxCriticalError() << "Unknown image content format " << (int)format;
++ if (format == SurfaceFormat::B8G8R8X8) {
++ return CAIRO_CONTENT_COLOR;
++ } else if (format != SurfaceFormat::B8G8R8A8) {
++ gfxCriticalError() << "Unknown image content format " << (int)format;
++ }
+ return CAIRO_CONTENT_COLOR_ALPHA;
+ }
+ }
diff --git a/www/firefox-esr/files/patch-bug1269654_comment5 b/www/firefox-esr/files/patch-bug1269654_comment5
deleted file mode 100644
index 0aa2d639d352..000000000000
--- a/www/firefox-esr/files/patch-bug1269654_comment5
+++ /dev/null
@@ -1,43 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=1269654#c5
-https://bug1269654.bmoattachments.org/attachment.cgi?id=8749234
-handle big-endian formats in Cairo format conversions
-
-# HG changeset patch
-# User Lee Salzman <lsalzman@mozilla.com>
-# Date 1462463631 14400
-# Thu May 05 11:53:51 2016 -0400
-# Node ID 8da374804a09977c8f89af5e6e0cb37cb074595d
-# Parent 29662e28a9c93ac67ee0b8ddfb65a9f29bbf73f5
-handle big-endian formats in Cairo format conversions
-
---- gfx/2d/HelpersCairo.h.orig 2019-12-02 17:51:16.633474000 +0100
-+++ gfx/2d/HelpersCairo.h 2019-12-02 17:52:44.939998000 +0100
-@@ -147,7 +147,14 @@ static inline cairo_format_t GfxFormatToCairoFormat(Su
- case SurfaceFormat::R5G6B5_UINT16:
- return CAIRO_FORMAT_RGB16_565;
- default:
-- gfxCriticalError() << "Unknown image format " << (int)format;
-+ // _UINT32 formats don't match B8G8R8[AX]8 on big-endian platforms,
-+ // and Moz2d uses B8G8R8[AX]8 as if it was _UINT32.
-+ // See bug 1269654
-+ if (format == SurfaceFormat::B8G8R8X8) {
-+ return CAIRO_FORMAT_RGB24;
-+ } else if (format != SurfaceFormat::B8G8R8A8) {
-+ gfxCriticalError() << "Unknown image format " << (int)format;
-+ }
- return CAIRO_FORMAT_ARGB32;
- }
- }
-@@ -177,7 +184,11 @@ static inline cairo_content_t GfxFormatToCairoContent(
- case SurfaceFormat::A8:
- return CAIRO_CONTENT_ALPHA;
- default:
-- gfxCriticalError() << "Unknown image content format " << (int)format;
-+ if (format == SurfaceFormat::B8G8R8X8) {
-+ return CAIRO_CONTENT_COLOR;
-+ } else if (format != SurfaceFormat::B8G8R8A8) {
-+ gfxCriticalError() << "Unknown image content format " << (int)format;
-+ }
- return CAIRO_CONTENT_COLOR_ALPHA;
- }
- }
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index ec606d2c016e..0e959ff55752 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,5 +1,6 @@
PORTNAME= firefox
-DISTVERSION= 146.0.1
+DISTVERSION= 147.0
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= www wayland
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \
@@ -11,8 +12,7 @@ COMMENT= Web browser based on the browser portion of Mozilla
WWW= https://www.firefox.com/
BUILD_DEPENDS= nspr>=4.32:devel/nspr \
- nss>=3.118:security/nss \
- icu>=76.1:devel/icu \
+ nss>=3.119:security/nss \
libevent>=2.1.8:devel/libevent \
harfbuzz>=10.1.0:print/harfbuzz \
graphite2>=1.3.14:graphics/graphite2 \
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 338c658b64f9..7b367582f80a 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1765990443
-SHA256 (firefox-146.0.1.source.tar.xz) = e9678a0e8473923953e1dc312c37919068623b6aa20adade16266049258191eb
-SIZE (firefox-146.0.1.source.tar.xz) = 648938528
+TIMESTAMP = 1767660756
+SHA256 (firefox-147.0.source.tar.xz) = 222d8e63754f1e5b1789cb928d7f973e0168819c492bb0eb402b1d472e4fd9fe
+SIZE (firefox-147.0.source.tar.xz) = 659319748
diff --git a/www/firefox/files/patch-bug1269654 b/www/firefox/files/patch-bug1269654
new file mode 100644
index 000000000000..9f9265f86bfe
--- /dev/null
+++ b/www/firefox/files/patch-bug1269654
@@ -0,0 +1,34 @@
+commit ff13efe458e7786d8c810342d25a6ba8e90a422b
+Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
+
+ based on BMO 1269654
+
+ : https://bugzilla.mozilla.org/show_bug.cgi?id=1269654#c5
+ : https://bug1269654.bmoattachments.org/attachment.cgi?id=8749234
+ : handle big-endian formats in Cairo format conversions
+ :
+ : HG changeset patch
+ : User Lee Salzman <lsalzman@mozilla.com>
+ : Date 1462463631 14400
+ : Thu May 05 11:53:51 2016 -0400
+ : Node ID 8da374804a09977c8f89af5e6e0cb37cb074595d
+ : Parent 29662e28a9c93ac67ee0b8ddfb65a9f29bbf73f5
+ : handle big-endian formats in Cairo format conversions
+
+diff --git gfx/2d/HelpersCairo.h gfx/2d/HelpersCairo.h
+index a10e01bdd62b..f2007ee189fc 100644
+--- gfx/2d/HelpersCairo.h
++++ gfx/2d/HelpersCairo.h
+@@ -185,7 +185,11 @@ static inline cairo_content_t GfxFormatToCairoContent(SurfaceFormat format) {
+ case SurfaceFormat::A8:
+ return CAIRO_CONTENT_ALPHA;
+ default:
+- gfxCriticalError() << "Unknown image content format " << (int)format;
++ if (format == SurfaceFormat::B8G8R8X8) {
++ return CAIRO_CONTENT_COLOR;
++ } else if (format != SurfaceFormat::B8G8R8A8) {
++ gfxCriticalError() << "Unknown image content format " << (int)format;
++ }
+ return CAIRO_CONTENT_COLOR_ALPHA;
+ }
+ }
diff --git a/www/firefox/files/patch-bug1269654_comment5 b/www/firefox/files/patch-bug1269654_comment5
deleted file mode 100644
index 0aa2d639d352..000000000000
--- a/www/firefox/files/patch-bug1269654_comment5
+++ /dev/null
@@ -1,43 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=1269654#c5
-https://bug1269654.bmoattachments.org/attachment.cgi?id=8749234
-handle big-endian formats in Cairo format conversions
-
-# HG changeset patch
-# User Lee Salzman <lsalzman@mozilla.com>
-# Date 1462463631 14400
-# Thu May 05 11:53:51 2016 -0400
-# Node ID 8da374804a09977c8f89af5e6e0cb37cb074595d
-# Parent 29662e28a9c93ac67ee0b8ddfb65a9f29bbf73f5
-handle big-endian formats in Cairo format conversions
-
---- gfx/2d/HelpersCairo.h.orig 2019-12-02 17:51:16.633474000 +0100
-+++ gfx/2d/HelpersCairo.h 2019-12-02 17:52:44.939998000 +0100
-@@ -147,7 +147,14 @@ static inline cairo_format_t GfxFormatToCairoFormat(Su
- case SurfaceFormat::R5G6B5_UINT16:
- return CAIRO_FORMAT_RGB16_565;
- default:
-- gfxCriticalError() << "Unknown image format " << (int)format;
-+ // _UINT32 formats don't match B8G8R8[AX]8 on big-endian platforms,
-+ // and Moz2d uses B8G8R8[AX]8 as if it was _UINT32.
-+ // See bug 1269654
-+ if (format == SurfaceFormat::B8G8R8X8) {
-+ return CAIRO_FORMAT_RGB24;
-+ } else if (format != SurfaceFormat::B8G8R8A8) {
-+ gfxCriticalError() << "Unknown image format " << (int)format;
-+ }
- return CAIRO_FORMAT_ARGB32;
- }
- }
-@@ -177,7 +184,11 @@ static inline cairo_content_t GfxFormatToCairoContent(
- case SurfaceFormat::A8:
- return CAIRO_CONTENT_ALPHA;
- default:
-- gfxCriticalError() << "Unknown image content format " << (int)format;
-+ if (format == SurfaceFormat::B8G8R8X8) {
-+ return CAIRO_CONTENT_COLOR;
-+ } else if (format != SurfaceFormat::B8G8R8A8) {
-+ gfxCriticalError() << "Unknown image content format " << (int)format;
-+ }
- return CAIRO_CONTENT_COLOR_ALPHA;
- }
- }
diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated
index 870dbd0fc349..78aafcf7ed70 100644
--- a/www/firefox/files/patch-libwebrtc-generated
+++ b/www/firefox/files/patch-libwebrtc-generated
@@ -1,22 +1,13 @@
-commit 91d5feee32ac273c405d11b7533478e125ba1b28
+commit 462d04e65b861f39087a21d6124fde12a17f17e3
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
-Date: Tue Nov 25 22:46:47 2025 +0000
- regenerate FreeBSD libwebrtc patch for gecko 146
+ regenerate FreeBSD libwebrtc patch for gecko 147
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 aee79e4f8762..53fb767b2713 100644
+index a4922c66929f..210a9a828897 100644
--- third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
+++ third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -24,6 +15,7 @@ index aee79e4f8762..53fb767b2713 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -32,23 +24,18 @@ index aee79e4f8762..53fb767b2713 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -67,10 +54,6 @@ index aee79e4f8762..53fb767b2713 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -78,10 +61,6 @@ index aee79e4f8762..53fb767b2713 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -89,7 +68,6 @@ index aee79e4f8762..53fb767b2713 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -97,10 +75,6 @@ index aee79e4f8762..53fb767b2713 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -113,10 +87,6 @@ index aee79e4f8762..53fb767b2713 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -147,7 +117,7 @@ index aee79e4f8762..53fb767b2713 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -234,7 +204,7 @@ index aee79e4f8762..53fb767b2713 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 bd1db8d43c59..b9b8f890ae52 100644
+index f1102c30059a..d2ebee0ec710 100644
--- third_party/libwebrtc/api/array_view_gn/moz.build
+++ third_party/libwebrtc/api/array_view_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -245,6 +215,7 @@ index bd1db8d43c59..b9b8f890ae52 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -253,13 +224,12 @@ index bd1db8d43c59..b9b8f890ae52 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -298,7 +268,6 @@ index bd1db8d43c59..b9b8f890ae52 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -348,7 +317,7 @@ index bd1db8d43c59..b9b8f890ae52 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -374,7 +343,7 @@ index bd1db8d43c59..b9b8f890ae52 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -416,7 +385,7 @@ index bd1db8d43c59..b9b8f890ae52 100644
-
Library("array_view_gn")
diff --git third_party/libwebrtc/api/async_dns_resolver_gn/moz.build third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
-index 02d940bac470..eaca805506ef 100644
+index b4939a5514c1..1c688af7efa3 100644
--- third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
+++ third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -427,6 +396,7 @@ index 02d940bac470..eaca805506ef 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -435,13 +405,12 @@ index 02d940bac470..eaca805506ef 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,95 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -481,7 +450,6 @@ index 02d940bac470..eaca805506ef 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -538,7 +506,7 @@ index 02d940bac470..eaca805506ef 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -564,7 +532,7 @@ index 02d940bac470..eaca805506ef 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -166,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -606,18 +574,10 @@ index 02d940bac470..eaca805506ef 100644
-
Library("async_dns_resolver_gn")
diff --git third_party/libwebrtc/api/audio/aec3_config_gn/moz.build third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
-index 9281d07ae0fd..6b5d596ace4a 100644
+index 4ae595bcba6d..3e9fbb0332ff 100644
--- third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
+++ third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -625,6 +585,7 @@ index 9281d07ae0fd..6b5d596ace4a 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -633,23 +594,18 @@ index 9281d07ae0fd..6b5d596ace4a 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -668,10 +624,6 @@ index 9281d07ae0fd..6b5d596ace4a 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -679,10 +631,6 @@ index 9281d07ae0fd..6b5d596ace4a 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -690,7 +638,6 @@ index 9281d07ae0fd..6b5d596ace4a 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -698,10 +645,6 @@ index 9281d07ae0fd..6b5d596ace4a 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -714,10 +657,6 @@ index 9281d07ae0fd..6b5d596ace4a 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -748,7 +687,7 @@ index 9281d07ae0fd..6b5d596ace4a 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -835,18 +774,10 @@ index 9281d07ae0fd..6b5d596ace4a 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 21a38089fa53..9edfe25c428b 100644
+index 6f88ea8491e1..9fe5afa4dd03 100644
--- third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -855,6 +786,7 @@ index 21a38089fa53..9edfe25c428b 100644
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -863,23 +795,18 @@ index 21a38089fa53..9edfe25c428b 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -898,10 +825,6 @@ index 21a38089fa53..9edfe25c428b 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -909,10 +832,6 @@ index 21a38089fa53..9edfe25c428b 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -920,7 +839,6 @@ index 21a38089fa53..9edfe25c428b 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -928,10 +846,6 @@ index 21a38089fa53..9edfe25c428b 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -944,10 +858,6 @@ index 21a38089fa53..9edfe25c428b 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -985,7 +895,7 @@ index 21a38089fa53..9edfe25c428b 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -1043,10 +953,10 @@ index 21a38089fa53..9edfe25c428b 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -1057,10 +967,10 @@ index 21a38089fa53..9edfe25c428b 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -1072,7 +982,7 @@ index 21a38089fa53..9edfe25c428b 100644
Library("aec3_factory_gn")
diff --git third_party/libwebrtc/api/audio/audio_device_gn/moz.build third_party/libwebrtc/api/audio/audio_device_gn/moz.build
-index ec9e287800f9..8406c1f27370 100644
+index 8e0dddd4c23e..1812ab6bedf8 100644
--- third_party/libwebrtc/api/audio/audio_device_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_device_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -1083,6 +993,7 @@ index ec9e287800f9..8406c1f27370 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -1091,13 +1002,12 @@ index ec9e287800f9..8406c1f27370 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1136,7 +1046,6 @@ index ec9e287800f9..8406c1f27370 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -1186,7 +1095,7 @@ index ec9e287800f9..8406c1f27370 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -1212,7 +1121,7 @@ index ec9e287800f9..8406c1f27370 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -1254,18 +1163,10 @@ index ec9e287800f9..8406c1f27370 100644
-
Library("audio_device_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 48004d56d26c..eead287814ee 100644
+index fb633e3930e2..9ba8edf80c44 100644
--- third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -1273,6 +1174,7 @@ index 48004d56d26c..eead287814ee 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -1281,23 +1183,18 @@ index 48004d56d26c..eead287814ee 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -1316,10 +1213,6 @@ index 48004d56d26c..eead287814ee 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -1327,10 +1220,6 @@ index 48004d56d26c..eead287814ee 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -1338,7 +1227,6 @@ index 48004d56d26c..eead287814ee 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -1346,10 +1234,6 @@ index 48004d56d26c..eead287814ee 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -1362,10 +1246,6 @@ index 48004d56d26c..eead287814ee 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -1403,7 +1283,7 @@ index 48004d56d26c..eead287814ee 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -1461,10 +1341,10 @@ index 48004d56d26c..eead287814ee 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -1475,10 +1355,10 @@ index 48004d56d26c..eead287814ee 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -1490,7 +1370,7 @@ index 48004d56d26c..eead287814ee 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 e24b887aca02..afe5ea321104 100644
+index 0088f18ad2dc..8228190616ec 100644
--- third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -1501,6 +1381,7 @@ index e24b887aca02..afe5ea321104 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -1509,13 +1390,12 @@ index e24b887aca02..afe5ea321104 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1550,7 +1430,6 @@ index e24b887aca02..afe5ea321104 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -1600,7 +1479,7 @@ index e24b887aca02..afe5ea321104 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -1626,7 +1505,7 @@ index e24b887aca02..afe5ea321104 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -1668,7 +1547,7 @@ index e24b887aca02..afe5ea321104 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 c71e4aefc473..d5094f32fe87 100644
+index 28b98ffce7a9..ac544c619786 100644
--- third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -1679,6 +1558,7 @@ index c71e4aefc473..d5094f32fe87 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -1687,13 +1567,12 @@ index c71e4aefc473..d5094f32fe87 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1732,7 +1611,6 @@ index c71e4aefc473..d5094f32fe87 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -1789,7 +1667,7 @@ index c71e4aefc473..d5094f32fe87 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -1815,7 +1693,7 @@ index c71e4aefc473..d5094f32fe87 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -1857,18 +1735,10 @@ index c71e4aefc473..d5094f32fe87 100644
-
Library("audio_mixer_api_gn")
diff --git third_party/libwebrtc/api/audio/audio_processing_gn/moz.build third_party/libwebrtc/api/audio/audio_processing_gn/moz.build
-index d978579b2abd..8ca9f207ec62 100644
+index cdd225e6797e..bc5318d09ca8 100644
--- third_party/libwebrtc/api/audio/audio_processing_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_processing_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -1876,6 +1746,7 @@ index d978579b2abd..8ca9f207ec62 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -1884,23 +1755,18 @@ index d978579b2abd..8ca9f207ec62 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -1919,10 +1785,6 @@ index d978579b2abd..8ca9f207ec62 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -1930,10 +1792,6 @@ index d978579b2abd..8ca9f207ec62 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -1941,7 +1799,6 @@ index d978579b2abd..8ca9f207ec62 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -1949,10 +1806,6 @@ index d978579b2abd..8ca9f207ec62 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -1965,10 +1818,6 @@ index d978579b2abd..8ca9f207ec62 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -2006,7 +1855,7 @@ index d978579b2abd..8ca9f207ec62 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -2064,10 +1913,10 @@ index d978579b2abd..8ca9f207ec62 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -2078,10 +1927,10 @@ index d978579b2abd..8ca9f207ec62 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -2093,18 +1942,10 @@ index d978579b2abd..8ca9f207ec62 100644
Library("audio_processing_gn")
diff --git third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build
-index bcbad6855330..fc175bc15db7 100644
+index 5e452f4c3ed0..fcb573b9c8c6 100644
--- third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -2112,6 +1953,7 @@ index bcbad6855330..fc175bc15db7 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -2120,23 +1962,18 @@ index bcbad6855330..fc175bc15db7 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,103 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -2151,10 +1988,6 @@ index bcbad6855330..fc175bc15db7 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -2162,10 +1995,6 @@ index bcbad6855330..fc175bc15db7 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -2173,7 +2002,6 @@ index bcbad6855330..fc175bc15db7 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -2181,10 +2009,6 @@ index bcbad6855330..fc175bc15db7 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -2197,10 +2021,6 @@ index bcbad6855330..fc175bc15db7 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -2231,7 +2051,7 @@ index bcbad6855330..fc175bc15db7 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -150,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -2289,10 +2109,10 @@ index bcbad6855330..fc175bc15db7 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -2303,10 +2123,10 @@ index bcbad6855330..fc175bc15db7 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -2318,18 +2138,10 @@ index bcbad6855330..fc175bc15db7 100644
Library("audio_processing_statistics_gn")
diff --git third_party/libwebrtc/api/audio/builtin_audio_processing_builder_gn/moz.build third_party/libwebrtc/api/audio/builtin_audio_processing_builder_gn/moz.build
-index 91819267ea18..190da4597629 100644
+index 23730cb4c781..b3c9022f62d2 100644
--- third_party/libwebrtc/api/audio/builtin_audio_processing_builder_gn/moz.build
+++ third_party/libwebrtc/api/audio/builtin_audio_processing_builder_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -2338,6 +2150,7 @@ index 91819267ea18..190da4597629 100644
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -2346,23 +2159,18 @@ index 91819267ea18..190da4597629 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -2381,10 +2189,6 @@ index 91819267ea18..190da4597629 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -2392,10 +2196,6 @@ index 91819267ea18..190da4597629 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -2403,7 +2203,6 @@ index 91819267ea18..190da4597629 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -2411,10 +2210,6 @@ index 91819267ea18..190da4597629 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -2427,10 +2222,6 @@ index 91819267ea18..190da4597629 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -2468,7 +2259,7 @@ index 91819267ea18..190da4597629 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -2526,10 +2317,10 @@ index 91819267ea18..190da4597629 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -2540,10 +2331,10 @@ index 91819267ea18..190da4597629 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -2555,7 +2346,7 @@ index 91819267ea18..190da4597629 100644
Library("builtin_audio_processing_builder_gn")
diff --git third_party/libwebrtc/api/audio/echo_control_gn/moz.build third_party/libwebrtc/api/audio/echo_control_gn/moz.build
-index 0447b43cda76..e63333ff3a68 100644
+index 003dd55e4b8c..a7421daf3fc4 100644
--- third_party/libwebrtc/api/audio/echo_control_gn/moz.build
+++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -2566,6 +2357,7 @@ index 0447b43cda76..e63333ff3a68 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -2574,13 +2366,12 @@ index 0447b43cda76..e63333ff3a68 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2619,7 +2410,6 @@ index 0447b43cda76..e63333ff3a68 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -2676,7 +2466,7 @@ index 0447b43cda76..e63333ff3a68 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -2702,7 +2492,7 @@ index 0447b43cda76..e63333ff3a68 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -2744,18 +2534,10 @@ index 0447b43cda76..e63333ff3a68 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 ddc08b43582a..3474430e39d6 100644
+index 6877f2e2caba..0a94c771f597 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -2763,6 +2545,7 @@ index ddc08b43582a..3474430e39d6 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -2771,23 +2554,18 @@ index ddc08b43582a..3474430e39d6 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -2806,10 +2584,6 @@ index ddc08b43582a..3474430e39d6 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -2817,10 +2591,6 @@ index ddc08b43582a..3474430e39d6 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -2828,7 +2598,6 @@ index ddc08b43582a..3474430e39d6 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -2836,10 +2605,6 @@ index ddc08b43582a..3474430e39d6 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -2852,10 +2617,6 @@ index ddc08b43582a..3474430e39d6 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -2893,7 +2654,7 @@ index ddc08b43582a..3474430e39d6 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -2951,10 +2712,10 @@ index ddc08b43582a..3474430e39d6 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -2965,10 +2726,10 @@ index ddc08b43582a..3474430e39d6 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -2980,18 +2741,10 @@ index ddc08b43582a..3474430e39d6 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 4f20b35f175a..c897f5d972c6 100644
+index 107e5544da1b..44b16b46dd4b 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -2999,6 +2752,7 @@ index 4f20b35f175a..c897f5d972c6 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -3007,23 +2761,18 @@ index 4f20b35f175a..c897f5d972c6 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -3042,10 +2791,6 @@ index 4f20b35f175a..c897f5d972c6 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -3053,10 +2798,6 @@ index 4f20b35f175a..c897f5d972c6 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -3064,7 +2805,6 @@ index 4f20b35f175a..c897f5d972c6 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -3072,10 +2812,6 @@ index 4f20b35f175a..c897f5d972c6 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -3088,10 +2824,6 @@ index 4f20b35f175a..c897f5d972c6 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -3129,7 +2861,7 @@ index 4f20b35f175a..c897f5d972c6 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -3187,10 +2919,10 @@ index 4f20b35f175a..c897f5d972c6 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -3201,10 +2933,10 @@ index 4f20b35f175a..c897f5d972c6 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -3216,18 +2948,10 @@ index 4f20b35f175a..c897f5d972c6 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 34219b497edb..f92b57a92fad 100644
+index 2fcb098ef1df..624eb7a63ed3 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -3235,6 +2959,7 @@ index 34219b497edb..f92b57a92fad 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -3243,23 +2968,18 @@ index 34219b497edb..f92b57a92fad 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -49,114 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -3278,10 +2998,6 @@ index 34219b497edb..f92b57a92fad 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -3289,10 +3005,6 @@ index 34219b497edb..f92b57a92fad 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -3300,7 +3012,6 @@ index 34219b497edb..f92b57a92fad 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -3308,10 +3019,6 @@ index 34219b497edb..f92b57a92fad 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -3324,10 +3031,6 @@ index 34219b497edb..f92b57a92fad 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -3365,7 +3068,7 @@ index 34219b497edb..f92b57a92fad 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -164,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -3423,10 +3126,10 @@ index 34219b497edb..f92b57a92fad 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -3437,10 +3140,10 @@ index 34219b497edb..f92b57a92fad 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -3452,18 +3155,10 @@ index 34219b497edb..f92b57a92fad 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 dd1fb2ab90f9..9ca2d1b9cc08 100644
+index 2dfec6bd8ace..2c87cb06e541 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
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -3471,6 +3166,7 @@ index dd1fb2ab90f9..9ca2d1b9cc08 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -3480,23 +3176,18 @@ index dd1fb2ab90f9..9ca2d1b9cc08 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -3515,10 +3206,6 @@ index dd1fb2ab90f9..9ca2d1b9cc08 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -3526,10 +3213,6 @@ index dd1fb2ab90f9..9ca2d1b9cc08 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -3537,7 +3220,6 @@ index dd1fb2ab90f9..9ca2d1b9cc08 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -3545,10 +3227,6 @@ index dd1fb2ab90f9..9ca2d1b9cc08 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -3561,10 +3239,6 @@ index dd1fb2ab90f9..9ca2d1b9cc08 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -3602,7 +3276,7 @@ index dd1fb2ab90f9..9ca2d1b9cc08 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -3660,10 +3334,10 @@ index dd1fb2ab90f9..9ca2d1b9cc08 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -3674,10 +3348,10 @@ index dd1fb2ab90f9..9ca2d1b9cc08 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -3689,18 +3363,10 @@ index dd1fb2ab90f9..9ca2d1b9cc08 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 5c50f1d023a5..f4d3b969a2d8 100644
+index 559645de2de6..8af7c3467f2b 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
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -3708,6 +3374,7 @@ index 5c50f1d023a5..f4d3b969a2d8 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -3717,23 +3384,18 @@ index 5c50f1d023a5..f4d3b969a2d8 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -3752,10 +3414,6 @@ index 5c50f1d023a5..f4d3b969a2d8 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -3763,10 +3421,6 @@ index 5c50f1d023a5..f4d3b969a2d8 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -3774,7 +3428,6 @@ index 5c50f1d023a5..f4d3b969a2d8 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -3782,10 +3435,6 @@ index 5c50f1d023a5..f4d3b969a2d8 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -3798,10 +3447,6 @@ index 5c50f1d023a5..f4d3b969a2d8 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -3839,7 +3484,7 @@ index 5c50f1d023a5..f4d3b969a2d8 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -3897,10 +3542,10 @@ index 5c50f1d023a5..f4d3b969a2d8 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -3911,10 +3556,10 @@ index 5c50f1d023a5..f4d3b969a2d8 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -3926,18 +3571,10 @@ index 5c50f1d023a5..f4d3b969a2d8 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 ff5f3ef6bb92..4ad68a39c2ef 100644
+index ad147399181d..b24120ede667 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -3945,6 +3582,7 @@ index ff5f3ef6bb92..4ad68a39c2ef 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -3953,23 +3591,18 @@ index ff5f3ef6bb92..4ad68a39c2ef 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -3988,10 +3621,6 @@ index ff5f3ef6bb92..4ad68a39c2ef 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -3999,10 +3628,6 @@ index ff5f3ef6bb92..4ad68a39c2ef 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -4010,7 +3635,6 @@ index ff5f3ef6bb92..4ad68a39c2ef 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -4018,10 +3642,6 @@ index ff5f3ef6bb92..4ad68a39c2ef 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -4034,10 +3654,6 @@ index ff5f3ef6bb92..4ad68a39c2ef 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -4075,7 +3691,7 @@ index ff5f3ef6bb92..4ad68a39c2ef 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -4133,10 +3749,10 @@ index ff5f3ef6bb92..4ad68a39c2ef 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -4147,10 +3763,10 @@ index ff5f3ef6bb92..4ad68a39c2ef 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -4162,18 +3778,10 @@ index ff5f3ef6bb92..4ad68a39c2ef 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 e06f9a48fb40..29c1063fe54f 100644
+index 6433c15e39ea..e2eb177fab83 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -4181,6 +3789,7 @@ index e06f9a48fb40..29c1063fe54f 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -4189,23 +3798,18 @@ index e06f9a48fb40..29c1063fe54f 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -4224,10 +3828,6 @@ index e06f9a48fb40..29c1063fe54f 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -4235,10 +3835,6 @@ index e06f9a48fb40..29c1063fe54f 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -4246,7 +3842,6 @@ index e06f9a48fb40..29c1063fe54f 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -4254,10 +3849,6 @@ index e06f9a48fb40..29c1063fe54f 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -4270,10 +3861,6 @@ index e06f9a48fb40..29c1063fe54f 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -4311,7 +3898,7 @@ index e06f9a48fb40..29c1063fe54f 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -4369,10 +3956,10 @@ index e06f9a48fb40..29c1063fe54f 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -4383,10 +3970,10 @@ index e06f9a48fb40..29c1063fe54f 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -4398,18 +3985,10 @@ index e06f9a48fb40..29c1063fe54f 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 3bf3cbe2d4c3..57d954de06c2 100644
+index e1a1d3c8e9d4..77c49f946aeb 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -4417,6 +3996,7 @@ index 3bf3cbe2d4c3..57d954de06c2 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -4425,23 +4005,18 @@ index 3bf3cbe2d4c3..57d954de06c2 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -4460,10 +4035,6 @@ index 3bf3cbe2d4c3..57d954de06c2 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -4471,10 +4042,6 @@ index 3bf3cbe2d4c3..57d954de06c2 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -4482,7 +4049,6 @@ index 3bf3cbe2d4c3..57d954de06c2 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -4490,10 +4056,6 @@ index 3bf3cbe2d4c3..57d954de06c2 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -4506,10 +4068,6 @@ index 3bf3cbe2d4c3..57d954de06c2 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -4547,7 +4105,7 @@ index 3bf3cbe2d4c3..57d954de06c2 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -4605,10 +4163,10 @@ index 3bf3cbe2d4c3..57d954de06c2 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -4619,10 +4177,10 @@ index 3bf3cbe2d4c3..57d954de06c2 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -4634,7 +4192,7 @@ index 3bf3cbe2d4c3..57d954de06c2 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 69b390a8d78d..da241ca25304 100644
+index 7254662163f2..3046572aba75 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -4645,6 +4203,7 @@ index 69b390a8d78d..da241ca25304 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -4653,13 +4212,12 @@ index 69b390a8d78d..da241ca25304 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4698,7 +4256,6 @@ index 69b390a8d78d..da241ca25304 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -4755,7 +4312,7 @@ index 69b390a8d78d..da241ca25304 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -4781,7 +4338,7 @@ index 69b390a8d78d..da241ca25304 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -4823,18 +4380,10 @@ index 69b390a8d78d..da241ca25304 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 4a214578903a..b263dc5c5671 100644
+index 7d9475c9e15e..d35fe3533ed8 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -4842,6 +4391,7 @@ index 4a214578903a..b263dc5c5671 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -4850,23 +4400,18 @@ index 4a214578903a..b263dc5c5671 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -4885,10 +4430,6 @@ index 4a214578903a..b263dc5c5671 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -4896,10 +4437,6 @@ index 4a214578903a..b263dc5c5671 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -4907,7 +4444,6 @@ index 4a214578903a..b263dc5c5671 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -4915,10 +4451,6 @@ index 4a214578903a..b263dc5c5671 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -4931,10 +4463,6 @@ index 4a214578903a..b263dc5c5671 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -4972,7 +4500,7 @@ index 4a214578903a..b263dc5c5671 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -5030,10 +4558,10 @@ index 4a214578903a..b263dc5c5671 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -5044,10 +4572,10 @@ index 4a214578903a..b263dc5c5671 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -5059,18 +4587,10 @@ index 4a214578903a..b263dc5c5671 100644
Library("audio_encoder_g722_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 7cdb268dfead..516dbbf91567 100644
+index 8d5b597b98cd..3c9f2c3b50cb 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -5078,6 +4598,7 @@ index 7cdb268dfead..516dbbf91567 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -5086,23 +4607,18 @@ index 7cdb268dfead..516dbbf91567 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -5121,10 +4637,6 @@ index 7cdb268dfead..516dbbf91567 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -5132,10 +4644,6 @@ index 7cdb268dfead..516dbbf91567 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -5143,7 +4651,6 @@ index 7cdb268dfead..516dbbf91567 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -5151,10 +4658,6 @@ index 7cdb268dfead..516dbbf91567 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -5167,10 +4670,6 @@ index 7cdb268dfead..516dbbf91567 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -5208,7 +4707,7 @@ index 7cdb268dfead..516dbbf91567 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -5266,10 +4765,10 @@ index 7cdb268dfead..516dbbf91567 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -5280,10 +4779,10 @@ index 7cdb268dfead..516dbbf91567 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -5295,7 +4794,7 @@ index 7cdb268dfead..516dbbf91567 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 0de46076d269..7f2da454fead 100644
+index 35c1f3b1d7dc..eeb1e3e24104 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -5306,6 +4805,7 @@ index 0de46076d269..7f2da454fead 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -5314,13 +4814,12 @@ index 0de46076d269..7f2da454fead 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5359,7 +4858,6 @@ index 0de46076d269..7f2da454fead 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -5416,7 +4914,7 @@ index 0de46076d269..7f2da454fead 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -5442,7 +4940,7 @@ index 0de46076d269..7f2da454fead 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -5484,18 +4982,10 @@ index 0de46076d269..7f2da454fead 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 ff8d5a8a045d..4eb2e353971f 100644
+index cf0f5ac728d5..21a0df0059f5 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -5503,6 +4993,7 @@ index ff8d5a8a045d..4eb2e353971f 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -5511,23 +5002,18 @@ index ff8d5a8a045d..4eb2e353971f 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -5546,10 +5032,6 @@ index ff8d5a8a045d..4eb2e353971f 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -5557,10 +5039,6 @@ index ff8d5a8a045d..4eb2e353971f 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -5568,7 +5046,6 @@ index ff8d5a8a045d..4eb2e353971f 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -5576,10 +5053,6 @@ index ff8d5a8a045d..4eb2e353971f 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -5592,10 +5065,6 @@ index ff8d5a8a045d..4eb2e353971f 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -5633,7 +5102,7 @@ index ff8d5a8a045d..4eb2e353971f 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -5691,10 +5160,10 @@ index ff8d5a8a045d..4eb2e353971f 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -5705,10 +5174,10 @@ index ff8d5a8a045d..4eb2e353971f 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -5720,18 +5189,10 @@ index ff8d5a8a045d..4eb2e353971f 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 d8667c0e683b..1c7456f0533e 100644
+index 2a92d825dff0..1acf41cea4cc 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -5739,6 +5200,7 @@ index d8667c0e683b..1c7456f0533e 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -5747,23 +5209,18 @@ index d8667c0e683b..1c7456f0533e 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -5782,10 +5239,6 @@ index d8667c0e683b..1c7456f0533e 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -5793,10 +5246,6 @@ index d8667c0e683b..1c7456f0533e 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -5804,7 +5253,6 @@ index d8667c0e683b..1c7456f0533e 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -5812,10 +5260,6 @@ index d8667c0e683b..1c7456f0533e 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -5828,10 +5272,6 @@ index d8667c0e683b..1c7456f0533e 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -5869,7 +5309,7 @@ index d8667c0e683b..1c7456f0533e 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -5927,10 +5367,10 @@ index d8667c0e683b..1c7456f0533e 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -5941,10 +5381,10 @@ index d8667c0e683b..1c7456f0533e 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -5956,18 +5396,10 @@ index d8667c0e683b..1c7456f0533e 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 228087036228..9cbb90f8404c 100644
+index 72567d1deba1..9d44290fa3c8 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
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -5975,6 +5407,7 @@ index 228087036228..9cbb90f8404c 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -5984,23 +5417,18 @@ index 228087036228..9cbb90f8404c 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -51,114 +64,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,93 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -6019,10 +5447,6 @@ index 228087036228..9cbb90f8404c 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -6030,10 +5454,6 @@ index 228087036228..9cbb90f8404c 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -6041,7 +5461,6 @@ index 228087036228..9cbb90f8404c 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -6049,10 +5468,6 @@ index 228087036228..9cbb90f8404c 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -6065,10 +5480,6 @@ index 228087036228..9cbb90f8404c 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -6106,7 +5517,7 @@ index 228087036228..9cbb90f8404c 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -166,82 +72,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -145,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -6164,10 +5575,10 @@ index 228087036228..9cbb90f8404c 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -6178,10 +5589,10 @@ index 228087036228..9cbb90f8404c 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -6193,18 +5604,10 @@ index 228087036228..9cbb90f8404c 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 768f143888a3..82aae85d04c3 100644
+index c38bcbc671fc..0bff614d13c4 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -6212,6 +5615,7 @@ index 768f143888a3..82aae85d04c3 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -6220,23 +5624,18 @@ index 768f143888a3..82aae85d04c3 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -6255,10 +5654,6 @@ index 768f143888a3..82aae85d04c3 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -6266,10 +5661,6 @@ index 768f143888a3..82aae85d04c3 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -6277,7 +5668,6 @@ index 768f143888a3..82aae85d04c3 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -6285,10 +5675,6 @@ index 768f143888a3..82aae85d04c3 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -6301,10 +5687,6 @@ index 768f143888a3..82aae85d04c3 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -6342,7 +5724,7 @@ index 768f143888a3..82aae85d04c3 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -6400,10 +5782,10 @@ index 768f143888a3..82aae85d04c3 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -6414,10 +5796,10 @@ index 768f143888a3..82aae85d04c3 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -6429,18 +5811,10 @@ index 768f143888a3..82aae85d04c3 100644
Library("audio_encoder_opus_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus_audio_decoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus_audio_decoder_factory_gn/moz.build
-index 29253b42c50c..093987e65a08 100644
+index 22027800ff54..889064300cef 100644
--- third_party/libwebrtc/api/audio_codecs/opus_audio_decoder_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus_audio_decoder_factory_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -6448,6 +5822,7 @@ index 29253b42c50c..093987e65a08 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -6456,23 +5831,18 @@ index 29253b42c50c..093987e65a08 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -6491,10 +5861,6 @@ index 29253b42c50c..093987e65a08 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -6502,10 +5868,6 @@ index 29253b42c50c..093987e65a08 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -6513,7 +5875,6 @@ index 29253b42c50c..093987e65a08 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -6521,10 +5882,6 @@ index 29253b42c50c..093987e65a08 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -6537,10 +5894,6 @@ index 29253b42c50c..093987e65a08 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -6578,7 +5931,7 @@ index 29253b42c50c..093987e65a08 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -6636,10 +5989,10 @@ index 29253b42c50c..093987e65a08 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -6650,10 +6003,10 @@ index 29253b42c50c..093987e65a08 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -6665,18 +6018,10 @@ index 29253b42c50c..093987e65a08 100644
Library("opus_audio_decoder_factory_gn")
diff --git third_party/libwebrtc/api/audio_options_api_gn/moz.build third_party/libwebrtc/api/audio_options_api_gn/moz.build
-index 13401fe31fc3..335c9e764a18 100644
+index c23c271b22e1..7132a5211aa1 100644
--- third_party/libwebrtc/api/audio_options_api_gn/moz.build
+++ third_party/libwebrtc/api/audio_options_api_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -6684,6 +6029,7 @@ index 13401fe31fc3..335c9e764a18 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -6692,23 +6038,18 @@ index 13401fe31fc3..335c9e764a18 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -6727,10 +6068,6 @@ index 13401fe31fc3..335c9e764a18 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -6738,10 +6075,6 @@ index 13401fe31fc3..335c9e764a18 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -6749,7 +6082,6 @@ index 13401fe31fc3..335c9e764a18 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -6757,10 +6089,6 @@ index 13401fe31fc3..335c9e764a18 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -6773,10 +6101,6 @@ index 13401fe31fc3..335c9e764a18 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -6807,7 +6131,7 @@ index 13401fe31fc3..335c9e764a18 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -6894,7 +6218,7 @@ index 13401fe31fc3..335c9e764a18 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 d82b6d36d152..0534696d9a46 100644
+index e554b81f633f..8999ae4c13a9 100644
--- third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
+++ third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -6905,6 +6229,7 @@ index d82b6d36d152..0534696d9a46 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -6913,13 +6238,12 @@ index d82b6d36d152..0534696d9a46 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6958,7 +6282,6 @@ index d82b6d36d152..0534696d9a46 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -7008,7 +6331,7 @@ index d82b6d36d152..0534696d9a46 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -7034,7 +6357,7 @@ index d82b6d36d152..0534696d9a46 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -7076,7 +6399,7 @@ index d82b6d36d152..0534696d9a46 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 705bf2e04244..52ae9a5aaa46 100644
+index 2d2e381b8423..bd8e01b40700 100644
--- third_party/libwebrtc/api/call_api_gn/moz.build
+++ third_party/libwebrtc/api/call_api_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -7087,6 +6410,7 @@ index 705bf2e04244..52ae9a5aaa46 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -7095,13 +6419,12 @@ index 705bf2e04244..52ae9a5aaa46 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7136,7 +6459,6 @@ index 705bf2e04244..52ae9a5aaa46 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -7186,7 +6508,7 @@ index 705bf2e04244..52ae9a5aaa46 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -7212,7 +6534,7 @@ index 705bf2e04244..52ae9a5aaa46 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -7254,7 +6576,7 @@ index 705bf2e04244..52ae9a5aaa46 100644
-
Library("call_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 2c37fab92885..eb610c5ae493 100644
+index 803d3f1eff52..cf3f00cfd583 100644
--- third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
+++ third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -7265,6 +6587,7 @@ index 2c37fab92885..eb610c5ae493 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -7273,13 +6596,12 @@ index 2c37fab92885..eb610c5ae493 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7318,7 +6640,6 @@ index 2c37fab92885..eb610c5ae493 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -7368,7 +6689,7 @@ index 2c37fab92885..eb610c5ae493 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -7394,7 +6715,7 @@ index 2c37fab92885..eb610c5ae493 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -7436,7 +6757,7 @@ index 2c37fab92885..eb610c5ae493 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 1e581de158e2..f470e1833365 100644
+index 64ce06200fbe..a4f99ff8357a 100644
--- third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
+++ third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -7447,6 +6768,7 @@ index 1e581de158e2..f470e1833365 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -7455,13 +6777,12 @@ index 1e581de158e2..f470e1833365 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7500,7 +6821,6 @@ index 1e581de158e2..f470e1833365 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -7550,7 +6870,7 @@ index 1e581de158e2..f470e1833365 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -7576,7 +6896,7 @@ index 1e581de158e2..f470e1833365 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -7618,18 +6938,10 @@ index 1e581de158e2..f470e1833365 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 c5a963140c3b..eb08976e0155 100644
+index 071165211246..77d8eb74d010 100644
--- third_party/libwebrtc/api/crypto/options_gn/moz.build
+++ third_party/libwebrtc/api/crypto/options_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -7637,6 +6949,7 @@ index c5a963140c3b..eb08976e0155 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -7645,23 +6958,18 @@ index c5a963140c3b..eb08976e0155 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -7680,10 +6988,6 @@ index c5a963140c3b..eb08976e0155 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -7691,10 +6995,6 @@ index c5a963140c3b..eb08976e0155 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -7702,7 +7002,6 @@ index c5a963140c3b..eb08976e0155 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -7710,10 +7009,6 @@ index c5a963140c3b..eb08976e0155 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -7726,10 +7021,6 @@ index c5a963140c3b..eb08976e0155 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -7760,7 +7051,7 @@ index c5a963140c3b..eb08976e0155 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -7846,19 +7137,11 @@ index c5a963140c3b..eb08976e0155 100644
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
Library("options_gn")
-diff --git third_party/libwebrtc/api/environment/environment_factory_gn/moz.build third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
-index bfe66c238792..fa0977f74725 100644
---- third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
-+++ third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+diff --git third_party/libwebrtc/api/environment/deprecated_global_field_trials_gn/moz.build third_party/libwebrtc/api/environment/deprecated_global_field_trials_gn/moz.build
+index 95b07bc6261f..4c2ff30dab40 100644
+--- third_party/libwebrtc/api/environment/deprecated_global_field_trials_gn/moz.build
++++ third_party/libwebrtc/api/environment/deprecated_global_field_trials_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -7866,6 +7149,7 @@ index bfe66c238792..fa0977f74725 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -7874,23 +7158,18 @@ index bfe66c238792..fa0977f74725 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -7909,10 +7188,6 @@ index bfe66c238792..fa0977f74725 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -7920,10 +7195,6 @@ index bfe66c238792..fa0977f74725 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -7931,7 +7202,6 @@ index bfe66c238792..fa0977f74725 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -7939,10 +7209,6 @@ index bfe66c238792..fa0977f74725 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -7955,10 +7221,6 @@ index bfe66c238792..fa0977f74725 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -7996,7 +7258,7 @@ index bfe66c238792..fa0977f74725 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -8054,24 +7316,231 @@ index bfe66c238792..fa0977f74725 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+-
- CXXFLAGS += [
- "-msse2"
- ]
-
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
++if CONFIG["TARGET_CPU"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+ Library("deprecated_global_field_trials_gn")
+diff --git third_party/libwebrtc/api/environment/environment_factory_gn/moz.build third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
+index ed3d1c43a856..fdd57e9f22b3 100644
+--- third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
++++ third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
++DEFINES["_FILE_OFFSET_BITS"] = "64"
++DEFINES["_LARGEFILE64_SOURCE"] = True
++DEFINES["_LARGEFILE_SOURCE"] = True
++DEFINES["__STDC_CONSTANT_MACROS"] = True
++DEFINES["__STDC_FORMAT_MACROS"] = True
+
+ FINAL_LIBRARY = "xul"
+
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
-
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_FILE_OFFSET_BITS"] = "64"
+- DEFINES["_LARGEFILE64_SOURCE"] = True
+- DEFINES["_LARGEFILE_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["WEBRTC_BSD"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_FILE_OFFSET_BITS"] = "64"
+- DEFINES["_LARGEFILE64_SOURCE"] = True
+- DEFINES["_LARGEFILE_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+- DEFINES["NOMINMAX"] = True
+- DEFINES["NTDDI_VERSION"] = "0x0A000000"
+- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
+- DEFINES["UNICODE"] = True
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["WEBRTC_WIN"] = True
+- DEFINES["WIN32"] = True
+- DEFINES["WIN32_LEAN_AND_MEAN"] = True
+- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+- DEFINES["WINVER"] = "0x0A00"
+- DEFINES["_ATL_NO_OPENGL"] = True
+- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
+- DEFINES["_CRT_RAND_S"] = True
+- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
+- DEFINES["_HAS_EXCEPTIONS"] = "0"
+- DEFINES["_HAS_NODISCARD"] = True
+- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+- DEFINES["_SECURE_ATL"] = True
+- DEFINES["_UNICODE"] = True
+- DEFINES["_WIN32_WINNT"] = "0x0A00"
+- DEFINES["_WINDOWS"] = True
+- DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
+- DEFINES["__STD_C"] = True
+-
+- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
+- "winmm"
+- ]
++ DEFINES["_DEBUG"] = True
+
+ if CONFIG["TARGET_CPU"] == "aarch64":
+
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+ DEFINES["WEBRTC_HAS_NEON"] = True
+ DEFINES["__ARM_NEON__"] = "1"
+
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+- CXXFLAGS += [
+- "-mfpu=neon"
+- ]
+-
+- DEFINES["WEBRTC_ARCH_ARM"] = True
+- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["TARGET_CPU"] == "loongarch64":
-
- DEFINES["_GNU_SOURCE"] = True
-
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+ if CONFIG["TARGET_CPU"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["TARGET_CPU"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["TARGET_CPU"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
CXXFLAGS += [
"-msse2"
]
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -8083,7 +7552,7 @@ index bfe66c238792..fa0977f74725 100644
Library("environment_factory_gn")
diff --git third_party/libwebrtc/api/environment/environment_gn/moz.build third_party/libwebrtc/api/environment/environment_gn/moz.build
-index 07ce4e1dbb2a..beaf734ba830 100644
+index 623399700cb5..631f307ea954 100644
--- third_party/libwebrtc/api/environment/environment_gn/moz.build
+++ third_party/libwebrtc/api/environment/environment_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -8094,6 +7563,7 @@ index 07ce4e1dbb2a..beaf734ba830 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -8102,13 +7572,12 @@ index 07ce4e1dbb2a..beaf734ba830 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8147,7 +7616,6 @@ index 07ce4e1dbb2a..beaf734ba830 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -8204,7 +7672,7 @@ index 07ce4e1dbb2a..beaf734ba830 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -8230,7 +7698,7 @@ index 07ce4e1dbb2a..beaf734ba830 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -8272,7 +7740,7 @@ index 07ce4e1dbb2a..beaf734ba830 100644
-
Library("environment_gn")
diff --git third_party/libwebrtc/api/fec_controller_api_gn/moz.build third_party/libwebrtc/api/fec_controller_api_gn/moz.build
-index 5313c0045ec2..aab46b963082 100644
+index 26322221e75c..c2960773bae5 100644
--- third_party/libwebrtc/api/fec_controller_api_gn/moz.build
+++ third_party/libwebrtc/api/fec_controller_api_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -8283,6 +7751,7 @@ index 5313c0045ec2..aab46b963082 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -8291,13 +7760,12 @@ index 5313c0045ec2..aab46b963082 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8336,7 +7804,6 @@ index 5313c0045ec2..aab46b963082 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -8393,7 +7860,7 @@ index 5313c0045ec2..aab46b963082 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -8419,7 +7886,7 @@ index 5313c0045ec2..aab46b963082 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -8461,18 +7928,10 @@ index 5313c0045ec2..aab46b963082 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 37de6d110f27..86f276f7dee2 100644
+index 834d5f8de566..382075b68488 100644
--- third_party/libwebrtc/api/field_trials_registry_gn/moz.build
+++ third_party/libwebrtc/api/field_trials_registry_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -8480,6 +7939,7 @@ index 37de6d110f27..86f276f7dee2 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -8488,23 +7948,18 @@ index 37de6d110f27..86f276f7dee2 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -8523,10 +7978,6 @@ index 37de6d110f27..86f276f7dee2 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -8534,10 +7985,6 @@ index 37de6d110f27..86f276f7dee2 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -8545,7 +7992,6 @@ index 37de6d110f27..86f276f7dee2 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -8553,10 +7999,6 @@ index 37de6d110f27..86f276f7dee2 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -8569,10 +8011,6 @@ index 37de6d110f27..86f276f7dee2 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -8610,7 +8048,7 @@ index 37de6d110f27..86f276f7dee2 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -8668,10 +8106,10 @@ index 37de6d110f27..86f276f7dee2 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -8682,10 +8120,10 @@ index 37de6d110f27..86f276f7dee2 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -8697,7 +8135,7 @@ index 37de6d110f27..86f276f7dee2 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 d229ad4b07f7..7f3c05488404 100644
+index 6b034fd3a963..59ff862b5aff 100644
--- third_party/libwebrtc/api/field_trials_view_gn/moz.build
+++ third_party/libwebrtc/api/field_trials_view_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -8708,6 +8146,7 @@ index d229ad4b07f7..7f3c05488404 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -8716,13 +8155,12 @@ index d229ad4b07f7..7f3c05488404 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8757,7 +8195,6 @@ index d229ad4b07f7..7f3c05488404 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -8807,7 +8244,7 @@ index d229ad4b07f7..7f3c05488404 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -8833,7 +8270,7 @@ index d229ad4b07f7..7f3c05488404 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -8875,18 +8312,10 @@ index d229ad4b07f7..7f3c05488404 100644
-
Library("field_trials_view_gn")
diff --git third_party/libwebrtc/api/frame_transformer_factory_gn/moz.build third_party/libwebrtc/api/frame_transformer_factory_gn/moz.build
-index 98cf27b280d5..169cbd285741 100644
+index e5a1b83d2822..a437cb5392b2 100644
--- third_party/libwebrtc/api/frame_transformer_factory_gn/moz.build
+++ third_party/libwebrtc/api/frame_transformer_factory_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -8894,6 +8323,7 @@ index 98cf27b280d5..169cbd285741 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -8902,23 +8332,18 @@ index 98cf27b280d5..169cbd285741 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -8938,10 +8363,6 @@ index 98cf27b280d5..169cbd285741 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -8949,10 +8370,6 @@ index 98cf27b280d5..169cbd285741 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -8960,7 +8377,6 @@ index 98cf27b280d5..169cbd285741 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -8968,10 +8384,6 @@ index 98cf27b280d5..169cbd285741 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -8984,10 +8396,6 @@ index 98cf27b280d5..169cbd285741 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -9025,7 +8433,7 @@ index 98cf27b280d5..169cbd285741 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -9083,10 +8491,10 @@ index 98cf27b280d5..169cbd285741 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -9097,10 +8505,10 @@ index 98cf27b280d5..169cbd285741 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -9112,18 +8520,10 @@ index 98cf27b280d5..169cbd285741 100644
Library("frame_transformer_factory_gn")
diff --git third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
-index 6b6749937d6a..fb36a9f6a884 100644
+index ba884e273d4b..b85c50f05417 100644
--- third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
+++ third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -9131,6 +8531,7 @@ index 6b6749937d6a..fb36a9f6a884 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -9139,23 +8540,18 @@ index 6b6749937d6a..fb36a9f6a884 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -9174,10 +8570,6 @@ index 6b6749937d6a..fb36a9f6a884 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -9185,10 +8577,6 @@ index 6b6749937d6a..fb36a9f6a884 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -9196,7 +8584,6 @@ index 6b6749937d6a..fb36a9f6a884 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -9204,10 +8591,6 @@ index 6b6749937d6a..fb36a9f6a884 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -9220,10 +8603,6 @@ index 6b6749937d6a..fb36a9f6a884 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -9261,7 +8640,7 @@ index 6b6749937d6a..fb36a9f6a884 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -9319,10 +8698,10 @@ index 6b6749937d6a..fb36a9f6a884 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -9333,10 +8712,10 @@ index 6b6749937d6a..fb36a9f6a884 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -9348,7 +8727,7 @@ index 6b6749937d6a..fb36a9f6a884 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 d4c22b97a672..942e98bfe0e2 100644
+index 37e1e4a3cb61..22e59d619687 100644
--- third_party/libwebrtc/api/function_view_gn/moz.build
+++ third_party/libwebrtc/api/function_view_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -9359,6 +8738,7 @@ index d4c22b97a672..942e98bfe0e2 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -9367,13 +8747,12 @@ index d4c22b97a672..942e98bfe0e2 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9412,7 +8791,6 @@ index d4c22b97a672..942e98bfe0e2 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -9462,7 +8840,7 @@ index d4c22b97a672..942e98bfe0e2 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -9488,7 +8866,7 @@ index d4c22b97a672..942e98bfe0e2 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -9530,7 +8908,7 @@ index d4c22b97a672..942e98bfe0e2 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 fa18e171a29e..81e962a72646 100644
+index 031193bbf246..420fe76c9250 100644
--- third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
+++ third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -9541,6 +8919,7 @@ index fa18e171a29e..81e962a72646 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -9549,13 +8928,12 @@ index fa18e171a29e..81e962a72646 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9590,7 +8968,6 @@ index fa18e171a29e..81e962a72646 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -9640,7 +9017,7 @@ index fa18e171a29e..81e962a72646 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -9666,7 +9043,7 @@ index fa18e171a29e..81e962a72646 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -9708,7 +9085,7 @@ index fa18e171a29e..81e962a72646 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 40b640eebadc..2134f306b45f 100644
+index 570cfe3e0f46..0cf698831744 100644
--- third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
+++ third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -9719,6 +9096,7 @@ index 40b640eebadc..2134f306b45f 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -9727,13 +9105,12 @@ index 40b640eebadc..2134f306b45f 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9768,7 +9145,6 @@ index 40b640eebadc..2134f306b45f 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -9818,7 +9194,7 @@ index 40b640eebadc..2134f306b45f 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -9844,7 +9220,7 @@ index 40b640eebadc..2134f306b45f 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -9886,7 +9262,7 @@ index 40b640eebadc..2134f306b45f 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 71e2e1f0bc05..903e6070a8d3 100644
+index bb48aa293591..0df5683760a9 100644
--- third_party/libwebrtc/api/location_gn/moz.build
+++ third_party/libwebrtc/api/location_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -9897,6 +9273,7 @@ index 71e2e1f0bc05..903e6070a8d3 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -9905,13 +9282,12 @@ index 71e2e1f0bc05..903e6070a8d3 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9946,7 +9322,6 @@ index 71e2e1f0bc05..903e6070a8d3 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -9996,7 +9371,7 @@ index 71e2e1f0bc05..903e6070a8d3 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -10022,7 +9397,7 @@ index 71e2e1f0bc05..903e6070a8d3 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -10064,7 +9439,7 @@ index 71e2e1f0bc05..903e6070a8d3 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 734e2ff2ee3c..a92aaf7d3960 100644
+index e8c3318f0297..e255232b7c0f 100644
--- third_party/libwebrtc/api/make_ref_counted_gn/moz.build
+++ third_party/libwebrtc/api/make_ref_counted_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -10075,6 +9450,7 @@ index 734e2ff2ee3c..a92aaf7d3960 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -10083,13 +9459,12 @@ index 734e2ff2ee3c..a92aaf7d3960 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10124,7 +9499,6 @@ index 734e2ff2ee3c..a92aaf7d3960 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -10174,7 +9548,7 @@ index 734e2ff2ee3c..a92aaf7d3960 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -10200,7 +9574,7 @@ index 734e2ff2ee3c..a92aaf7d3960 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -10242,18 +9616,10 @@ index 734e2ff2ee3c..a92aaf7d3960 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 9bda91f8387f..e2e583f0e715 100644
+index d2036a2a6aaa..84b69c959ded 100644
--- third_party/libwebrtc/api/media_stream_interface_gn/moz.build
+++ third_party/libwebrtc/api/media_stream_interface_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -10261,6 +9627,7 @@ index 9bda91f8387f..e2e583f0e715 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -10269,23 +9636,18 @@ index 9bda91f8387f..e2e583f0e715 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -10304,10 +9666,6 @@ index 9bda91f8387f..e2e583f0e715 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -10315,10 +9673,6 @@ index 9bda91f8387f..e2e583f0e715 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -10326,7 +9680,6 @@ index 9bda91f8387f..e2e583f0e715 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -10334,10 +9687,6 @@ index 9bda91f8387f..e2e583f0e715 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -10350,10 +9699,6 @@ index 9bda91f8387f..e2e583f0e715 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -10391,7 +9736,7 @@ index 9bda91f8387f..e2e583f0e715 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -10449,10 +9794,10 @@ index 9bda91f8387f..e2e583f0e715 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -10463,10 +9808,10 @@ index 9bda91f8387f..e2e583f0e715 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -10478,7 +9823,7 @@ index 9bda91f8387f..e2e583f0e715 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 175a179e516d..e3bc694d44e5 100644
+index 8fc12ea95fda..4dd6b378c5c6 100644
--- third_party/libwebrtc/api/metronome/metronome_gn/moz.build
+++ third_party/libwebrtc/api/metronome/metronome_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -10489,6 +9834,7 @@ index 175a179e516d..e3bc694d44e5 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -10497,13 +9843,12 @@ index 175a179e516d..e3bc694d44e5 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10542,7 +9887,6 @@ index 175a179e516d..e3bc694d44e5 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -10592,7 +9936,7 @@ index 175a179e516d..e3bc694d44e5 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -10618,7 +9962,7 @@ index 175a179e516d..e3bc694d44e5 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -10660,18 +10004,10 @@ index 175a179e516d..e3bc694d44e5 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 e881fd3e0895..9f788008e593 100644
+index 72fc97e1e4d0..578be91eda8a 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -10679,6 +10015,7 @@ index e881fd3e0895..9f788008e593 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -10687,23 +10024,18 @@ index e881fd3e0895..9f788008e593 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -10722,10 +10054,6 @@ index e881fd3e0895..9f788008e593 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -10733,10 +10061,6 @@ index e881fd3e0895..9f788008e593 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -10744,7 +10068,6 @@ index e881fd3e0895..9f788008e593 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -10752,10 +10075,6 @@ index e881fd3e0895..9f788008e593 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -10768,10 +10087,6 @@ index e881fd3e0895..9f788008e593 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -10809,7 +10124,7 @@ index e881fd3e0895..9f788008e593 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -10867,10 +10182,10 @@ index e881fd3e0895..9f788008e593 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -10881,10 +10196,10 @@ index e881fd3e0895..9f788008e593 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -10896,18 +10211,10 @@ index e881fd3e0895..9f788008e593 100644
Library("default_neteq_controller_factory_gn")
diff --git third_party/libwebrtc/api/neteq/default_neteq_factory_gn/moz.build third_party/libwebrtc/api/neteq/default_neteq_factory_gn/moz.build
-index 6c0ac3eacaa6..af150d2ad9c2 100644
+index 1fac43ca8133..3822f3c47cf0 100644
--- third_party/libwebrtc/api/neteq/default_neteq_factory_gn/moz.build
+++ third_party/libwebrtc/api/neteq/default_neteq_factory_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -10915,6 +10222,7 @@ index 6c0ac3eacaa6..af150d2ad9c2 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -10923,23 +10231,18 @@ index 6c0ac3eacaa6..af150d2ad9c2 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -10958,10 +10261,6 @@ index 6c0ac3eacaa6..af150d2ad9c2 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -10969,10 +10268,6 @@ index 6c0ac3eacaa6..af150d2ad9c2 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -10980,7 +10275,6 @@ index 6c0ac3eacaa6..af150d2ad9c2 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -10988,10 +10282,6 @@ index 6c0ac3eacaa6..af150d2ad9c2 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -11004,10 +10294,6 @@ index 6c0ac3eacaa6..af150d2ad9c2 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -11045,7 +10331,7 @@ index 6c0ac3eacaa6..af150d2ad9c2 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -11103,10 +10389,10 @@ index 6c0ac3eacaa6..af150d2ad9c2 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -11117,10 +10403,10 @@ index 6c0ac3eacaa6..af150d2ad9c2 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -11132,7 +10418,7 @@ index 6c0ac3eacaa6..af150d2ad9c2 100644
Library("default_neteq_factory_gn")
diff --git third_party/libwebrtc/api/neteq/delay_manager_api_gn/moz.build third_party/libwebrtc/api/neteq/delay_manager_api_gn/moz.build
-index 7b391f843b1a..e878c22c5811 100644
+index 3063e1118a14..1cef703f3744 100644
--- third_party/libwebrtc/api/neteq/delay_manager_api_gn/moz.build
+++ third_party/libwebrtc/api/neteq/delay_manager_api_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -11143,6 +10429,7 @@ index 7b391f843b1a..e878c22c5811 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -11151,13 +10438,12 @@ index 7b391f843b1a..e878c22c5811 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11196,7 +10482,6 @@ index 7b391f843b1a..e878c22c5811 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -11253,7 +10538,7 @@ index 7b391f843b1a..e878c22c5811 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -11279,7 +10564,7 @@ index 7b391f843b1a..e878c22c5811 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -11321,18 +10606,10 @@ index 7b391f843b1a..e878c22c5811 100644
-
Library("delay_manager_api_gn")
diff --git third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
-index 5870536292fb..5ca950628495 100644
+index 1afebecfa713..e6cae2901777 100644
--- third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
+++ third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -11340,6 +10617,7 @@ index 5870536292fb..5ca950628495 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -11348,23 +10626,18 @@ index 5870536292fb..5ca950628495 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -11383,10 +10656,6 @@ index 5870536292fb..5ca950628495 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -11394,10 +10663,6 @@ index 5870536292fb..5ca950628495 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -11405,7 +10670,6 @@ index 5870536292fb..5ca950628495 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -11413,10 +10677,6 @@ index 5870536292fb..5ca950628495 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -11429,10 +10689,6 @@ index 5870536292fb..5ca950628495 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -11470,7 +10726,7 @@ index 5870536292fb..5ca950628495 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -11528,10 +10784,10 @@ index 5870536292fb..5ca950628495 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -11542,10 +10798,10 @@ index 5870536292fb..5ca950628495 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -11557,7 +10813,7 @@ index 5870536292fb..5ca950628495 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 aaca246c346a..faadd8470d90 100644
+index 360aeb8c1888..b3725c959c68 100644
--- third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
+++ third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -11568,6 +10824,7 @@ index aaca246c346a..faadd8470d90 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -11576,13 +10833,12 @@ index aaca246c346a..faadd8470d90 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11621,7 +10877,6 @@ index aaca246c346a..faadd8470d90 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -11678,7 +10933,7 @@ index aaca246c346a..faadd8470d90 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -11704,7 +10959,7 @@ index aaca246c346a..faadd8470d90 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -11746,18 +11001,10 @@ index aaca246c346a..faadd8470d90 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 a35e00f8603e..627fb0d77b44 100644
+index ce574f703e85..f63d71206fa2 100644
--- third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
+++ third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -11765,6 +11012,7 @@ index a35e00f8603e..627fb0d77b44 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -11773,23 +11021,18 @@ index a35e00f8603e..627fb0d77b44 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -11808,10 +11051,6 @@ index a35e00f8603e..627fb0d77b44 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -11819,10 +11058,6 @@ index a35e00f8603e..627fb0d77b44 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -11830,7 +11065,6 @@ index a35e00f8603e..627fb0d77b44 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -11838,10 +11072,6 @@ index a35e00f8603e..627fb0d77b44 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -11854,10 +11084,6 @@ index a35e00f8603e..627fb0d77b44 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -11888,7 +11114,7 @@ index a35e00f8603e..627fb0d77b44 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -11975,7 +11201,7 @@ index a35e00f8603e..627fb0d77b44 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 89c7b2f1bbee..e19cb0366383 100644
+index dfdf9c995949..c5307e1d122c 100644
--- third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
+++ third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -11986,6 +11212,7 @@ index 89c7b2f1bbee..e19cb0366383 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -11994,13 +11221,12 @@ index 89c7b2f1bbee..e19cb0366383 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12035,7 +11261,6 @@ index 89c7b2f1bbee..e19cb0366383 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -12085,7 +11310,7 @@ index 89c7b2f1bbee..e19cb0366383 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -12111,7 +11336,7 @@ index 89c7b2f1bbee..e19cb0366383 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -12153,18 +11378,10 @@ index 89c7b2f1bbee..e19cb0366383 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 2ae9d6e256bf..9506fe3d8523 100644
+index bf2fa1665e7e..1048dc991346 100644
--- third_party/libwebrtc/api/priority_gn/moz.build
+++ third_party/libwebrtc/api/priority_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -12172,6 +11389,7 @@ index 2ae9d6e256bf..9506fe3d8523 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -12180,23 +11398,18 @@ index 2ae9d6e256bf..9506fe3d8523 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -12215,10 +11428,6 @@ index 2ae9d6e256bf..9506fe3d8523 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -12226,10 +11435,6 @@ index 2ae9d6e256bf..9506fe3d8523 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -12237,7 +11442,6 @@ index 2ae9d6e256bf..9506fe3d8523 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -12245,10 +11449,6 @@ index 2ae9d6e256bf..9506fe3d8523 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -12261,10 +11461,6 @@ index 2ae9d6e256bf..9506fe3d8523 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -12295,7 +11491,7 @@ index 2ae9d6e256bf..9506fe3d8523 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -12382,7 +11578,7 @@ index 2ae9d6e256bf..9506fe3d8523 100644
Library("priority_gn")
diff --git third_party/libwebrtc/api/ref_count_gn/moz.build third_party/libwebrtc/api/ref_count_gn/moz.build
-index 6e708d91c28e..8e5737e376cb 100644
+index b348930d7ec3..6e1ce2a4baad 100644
--- third_party/libwebrtc/api/ref_count_gn/moz.build
+++ third_party/libwebrtc/api/ref_count_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -12393,6 +11589,7 @@ index 6e708d91c28e..8e5737e376cb 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -12401,13 +11598,12 @@ index 6e708d91c28e..8e5737e376cb 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12442,7 +11638,6 @@ index 6e708d91c28e..8e5737e376cb 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -12492,7 +11687,7 @@ index 6e708d91c28e..8e5737e376cb 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -12518,7 +11713,7 @@ index 6e708d91c28e..8e5737e376cb 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -12560,7 +11755,7 @@ index 6e708d91c28e..8e5737e376cb 100644
-
Library("ref_count_gn")
diff --git third_party/libwebrtc/api/refcountedbase_gn/moz.build third_party/libwebrtc/api/refcountedbase_gn/moz.build
-index 5cc39bebe881..d7236ced3bac 100644
+index 8f218b17aea6..0d0dc0b4711b 100644
--- third_party/libwebrtc/api/refcountedbase_gn/moz.build
+++ third_party/libwebrtc/api/refcountedbase_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -12571,6 +11766,7 @@ index 5cc39bebe881..d7236ced3bac 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -12579,13 +11775,12 @@ index 5cc39bebe881..d7236ced3bac 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12620,7 +11815,6 @@ index 5cc39bebe881..d7236ced3bac 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -12670,7 +11864,7 @@ index 5cc39bebe881..d7236ced3bac 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -12696,7 +11890,7 @@ index 5cc39bebe881..d7236ced3bac 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -12738,18 +11932,10 @@ index 5cc39bebe881..d7236ced3bac 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 22af15c986d7..b08e37ef6637 100644
+index 8a09b2f6a451..4cd767026bc4 100644
--- third_party/libwebrtc/api/rtc_error_gn/moz.build
+++ third_party/libwebrtc/api/rtc_error_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -12757,6 +11943,7 @@ index 22af15c986d7..b08e37ef6637 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -12765,23 +11952,18 @@ index 22af15c986d7..b08e37ef6637 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -12800,10 +11982,6 @@ index 22af15c986d7..b08e37ef6637 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -12811,10 +11989,6 @@ index 22af15c986d7..b08e37ef6637 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -12822,7 +11996,6 @@ index 22af15c986d7..b08e37ef6637 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -12830,10 +12003,6 @@ index 22af15c986d7..b08e37ef6637 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -12846,10 +12015,6 @@ index 22af15c986d7..b08e37ef6637 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -12887,7 +12052,7 @@ index 22af15c986d7..b08e37ef6637 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -12945,10 +12110,10 @@ index 22af15c986d7..b08e37ef6637 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -12959,10 +12124,10 @@ index 22af15c986d7..b08e37ef6637 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -12974,18 +12139,10 @@ index 22af15c986d7..b08e37ef6637 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 ef7443badabe..1ebd539654ba 100644
+index e736b4682ea0..9f5e2d9ba4a3 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -12993,6 +12150,7 @@ index ef7443badabe..1ebd539654ba 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -13001,23 +12159,18 @@ index ef7443badabe..1ebd539654ba 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -13036,10 +12189,6 @@ index ef7443badabe..1ebd539654ba 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -13047,10 +12196,6 @@ index ef7443badabe..1ebd539654ba 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -13058,7 +12203,6 @@ index ef7443badabe..1ebd539654ba 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -13066,10 +12210,6 @@ index ef7443badabe..1ebd539654ba 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -13082,10 +12222,6 @@ index ef7443badabe..1ebd539654ba 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -13123,7 +12259,7 @@ index ef7443badabe..1ebd539654ba 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -13181,10 +12317,10 @@ index ef7443badabe..1ebd539654ba 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -13195,10 +12331,10 @@ index ef7443badabe..1ebd539654ba 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -13210,18 +12346,10 @@ index ef7443badabe..1ebd539654ba 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 6b8fa70f917e..ccb5b524512b 100644
+index fb46ff525fa5..4f0061742b36 100644
--- third_party/libwebrtc/api/rtp_headers_gn/moz.build
+++ third_party/libwebrtc/api/rtp_headers_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -13229,6 +12357,7 @@ index 6b8fa70f917e..ccb5b524512b 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -13237,23 +12366,18 @@ index 6b8fa70f917e..ccb5b524512b 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -13272,10 +12396,6 @@ index 6b8fa70f917e..ccb5b524512b 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -13283,10 +12403,6 @@ index 6b8fa70f917e..ccb5b524512b 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -13294,7 +12410,6 @@ index 6b8fa70f917e..ccb5b524512b 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -13302,10 +12417,6 @@ index 6b8fa70f917e..ccb5b524512b 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -13318,10 +12429,6 @@ index 6b8fa70f917e..ccb5b524512b 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -13359,7 +12466,7 @@ index 6b8fa70f917e..ccb5b524512b 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -13417,10 +12524,10 @@ index 6b8fa70f917e..ccb5b524512b 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -13431,10 +12538,10 @@ index 6b8fa70f917e..ccb5b524512b 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -13446,18 +12553,10 @@ index 6b8fa70f917e..ccb5b524512b 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 60ac57fdb088..e6d8ea47cb13 100644
+index 3a7abf97f0ae..462e922c57e9 100644
--- third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
+++ third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -13465,6 +12564,7 @@ index 60ac57fdb088..e6d8ea47cb13 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -13473,23 +12573,18 @@ index 60ac57fdb088..e6d8ea47cb13 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -13508,10 +12603,6 @@ index 60ac57fdb088..e6d8ea47cb13 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -13519,10 +12610,6 @@ index 60ac57fdb088..e6d8ea47cb13 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -13530,7 +12617,6 @@ index 60ac57fdb088..e6d8ea47cb13 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -13538,10 +12624,6 @@ index 60ac57fdb088..e6d8ea47cb13 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -13554,10 +12636,6 @@ index 60ac57fdb088..e6d8ea47cb13 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -13595,7 +12673,7 @@ index 60ac57fdb088..e6d8ea47cb13 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -13653,10 +12731,10 @@ index 60ac57fdb088..e6d8ea47cb13 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -13667,10 +12745,10 @@ index 60ac57fdb088..e6d8ea47cb13 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -13682,7 +12760,7 @@ index 60ac57fdb088..e6d8ea47cb13 100644
Library("rtp_packet_info_gn")
diff --git third_party/libwebrtc/api/rtp_packet_sender_gn/moz.build third_party/libwebrtc/api/rtp_packet_sender_gn/moz.build
-index f5380aa782ca..ada14ba1b2f8 100644
+index 7b9074f4195f..3f90e181f653 100644
--- third_party/libwebrtc/api/rtp_packet_sender_gn/moz.build
+++ third_party/libwebrtc/api/rtp_packet_sender_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -13693,6 +12771,7 @@ index f5380aa782ca..ada14ba1b2f8 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -13701,13 +12780,12 @@ index f5380aa782ca..ada14ba1b2f8 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13742,7 +12820,6 @@ index f5380aa782ca..ada14ba1b2f8 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -13792,7 +12869,7 @@ index f5380aa782ca..ada14ba1b2f8 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -13818,7 +12895,7 @@ index f5380aa782ca..ada14ba1b2f8 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -13860,18 +12937,10 @@ index f5380aa782ca..ada14ba1b2f8 100644
-
Library("rtp_packet_sender_gn")
diff --git third_party/libwebrtc/api/rtp_parameters_gn/moz.build third_party/libwebrtc/api/rtp_parameters_gn/moz.build
-index ca88debead18..ad44a44dbe44 100644
+index 4abaae2609eb..8228db31aa88 100644
--- third_party/libwebrtc/api/rtp_parameters_gn/moz.build
+++ third_party/libwebrtc/api/rtp_parameters_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -13879,6 +12948,7 @@ index ca88debead18..ad44a44dbe44 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -13887,23 +12957,18 @@ index ca88debead18..ad44a44dbe44 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,107 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -13922,10 +12987,6 @@ index ca88debead18..ad44a44dbe44 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -13933,10 +12994,6 @@ index ca88debead18..ad44a44dbe44 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -13944,7 +13001,6 @@ index ca88debead18..ad44a44dbe44 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -13952,10 +13008,6 @@ index ca88debead18..ad44a44dbe44 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -13968,10 +13020,6 @@ index ca88debead18..ad44a44dbe44 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -14002,7 +13050,7 @@ index ca88debead18..ad44a44dbe44 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -155,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -14089,7 +13137,7 @@ index ca88debead18..ad44a44dbe44 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 4d234f8b55b0..0ad2a4fbf32b 100644
+index 4d2b9eb891c6..b14399134c2d 100644
--- third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
+++ third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -14100,6 +13148,7 @@ index 4d234f8b55b0..0ad2a4fbf32b 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -14108,13 +13157,12 @@ index 4d234f8b55b0..0ad2a4fbf32b 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14149,7 +13197,6 @@ index 4d234f8b55b0..0ad2a4fbf32b 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -14199,7 +13246,7 @@ index 4d234f8b55b0..0ad2a4fbf32b 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -14225,7 +13272,7 @@ index 4d234f8b55b0..0ad2a4fbf32b 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -14267,18 +13314,10 @@ index 4d234f8b55b0..0ad2a4fbf32b 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 a4805ffc1c99..bff6bf560c8a 100644
+index 638db7eff309..361fb3659953 100644
--- third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
+++ third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -14286,6 +13325,7 @@ index a4805ffc1c99..bff6bf560c8a 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -14294,23 +13334,18 @@ index a4805ffc1c99..bff6bf560c8a 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -14329,10 +13364,6 @@ index a4805ffc1c99..bff6bf560c8a 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -14340,10 +13371,6 @@ index a4805ffc1c99..bff6bf560c8a 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -14351,7 +13378,6 @@ index a4805ffc1c99..bff6bf560c8a 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -14359,10 +13385,6 @@ index a4805ffc1c99..bff6bf560c8a 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -14375,10 +13397,6 @@ index a4805ffc1c99..bff6bf560c8a 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -14416,7 +13434,7 @@ index a4805ffc1c99..bff6bf560c8a 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -14474,10 +13492,10 @@ index a4805ffc1c99..bff6bf560c8a 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -14488,10 +13506,10 @@ index a4805ffc1c99..bff6bf560c8a 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -14503,7 +13521,7 @@ index a4805ffc1c99..bff6bf560c8a 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 3200010d7be9..a7f3de771f21 100644
+index 2ac81053797a..ad498fba2370 100644
--- third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
+++ third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -14514,6 +13532,7 @@ index 3200010d7be9..a7f3de771f21 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -14522,13 +13541,12 @@ index 3200010d7be9..a7f3de771f21 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14563,7 +13581,6 @@ index 3200010d7be9..a7f3de771f21 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -14613,7 +13630,7 @@ index 3200010d7be9..a7f3de771f21 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -14639,7 +13656,7 @@ index 3200010d7be9..a7f3de771f21 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -14681,7 +13698,7 @@ index 3200010d7be9..a7f3de771f21 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 05d52fc67a4c..0cc6993ab717 100644
+index 538b3be29bf7..d21843a6e841 100644
--- third_party/libwebrtc/api/scoped_refptr_gn/moz.build
+++ third_party/libwebrtc/api/scoped_refptr_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -14692,6 +13709,7 @@ index 05d52fc67a4c..0cc6993ab717 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -14700,13 +13718,12 @@ index 05d52fc67a4c..0cc6993ab717 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14741,7 +13758,6 @@ index 05d52fc67a4c..0cc6993ab717 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -14791,7 +13807,7 @@ index 05d52fc67a4c..0cc6993ab717 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -14817,7 +13833,7 @@ index 05d52fc67a4c..0cc6993ab717 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -14859,7 +13875,7 @@ index 05d52fc67a4c..0cc6993ab717 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 94361b85f4a3..1d99c403a99d 100644
+index 7191593a76b3..3d6fb81819e5 100644
--- third_party/libwebrtc/api/sequence_checker_gn/moz.build
+++ third_party/libwebrtc/api/sequence_checker_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -14870,6 +13886,7 @@ index 94361b85f4a3..1d99c403a99d 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -14878,13 +13895,12 @@ index 94361b85f4a3..1d99c403a99d 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14923,7 +13939,6 @@ index 94361b85f4a3..1d99c403a99d 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -14973,7 +13988,7 @@ index 94361b85f4a3..1d99c403a99d 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -14999,7 +14014,7 @@ index 94361b85f4a3..1d99c403a99d 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -15041,7 +14056,7 @@ index 94361b85f4a3..1d99c403a99d 100644
-
Library("sequence_checker_gn")
diff --git third_party/libwebrtc/api/task_queue/default_task_queue_factory_gn/moz.build third_party/libwebrtc/api/task_queue/default_task_queue_factory_gn/moz.build
-index 3efdfa726191..f049abc3ddf5 100644
+index 369ff54e9cc8..6cc93ea1aeff 100644
--- third_party/libwebrtc/api/task_queue/default_task_queue_factory_gn/moz.build
+++ third_party/libwebrtc/api/task_queue/default_task_queue_factory_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -15052,6 +14067,7 @@ index 3efdfa726191..f049abc3ddf5 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -15060,13 +14076,12 @@ index 3efdfa726191..f049abc3ddf5 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15101,7 +14116,6 @@ index 3efdfa726191..f049abc3ddf5 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -15151,7 +14165,7 @@ index 3efdfa726191..f049abc3ddf5 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -15177,7 +14191,7 @@ index 3efdfa726191..f049abc3ddf5 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -15219,18 +14233,10 @@ index 3efdfa726191..f049abc3ddf5 100644
-
Library("default_task_queue_factory_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 714eb9e748de..9359661039d6 100644
+index 3103b41da833..04259db6efb1 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -15238,6 +14244,7 @@ index 714eb9e748de..9359661039d6 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -15246,23 +14253,18 @@ index 714eb9e748de..9359661039d6 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -15281,10 +14283,6 @@ index 714eb9e748de..9359661039d6 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -15292,10 +14290,6 @@ index 714eb9e748de..9359661039d6 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -15303,7 +14297,6 @@ index 714eb9e748de..9359661039d6 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -15311,10 +14304,6 @@ index 714eb9e748de..9359661039d6 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -15327,10 +14316,6 @@ index 714eb9e748de..9359661039d6 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -15361,7 +14346,7 @@ index 714eb9e748de..9359661039d6 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -15448,18 +14433,10 @@ index 714eb9e748de..9359661039d6 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 67bbd643dcf2..f1a5bc97fc2c 100644
+index 4dfef6fa6711..c94462630755 100644
--- third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
+++ third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -15467,6 +14444,7 @@ index 67bbd643dcf2..f1a5bc97fc2c 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -15475,23 +14453,18 @@ index 67bbd643dcf2..f1a5bc97fc2c 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -15510,10 +14483,6 @@ index 67bbd643dcf2..f1a5bc97fc2c 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -15521,10 +14490,6 @@ index 67bbd643dcf2..f1a5bc97fc2c 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -15532,7 +14497,6 @@ index 67bbd643dcf2..f1a5bc97fc2c 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -15540,10 +14504,6 @@ index 67bbd643dcf2..f1a5bc97fc2c 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -15556,10 +14516,6 @@ index 67bbd643dcf2..f1a5bc97fc2c 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -15590,7 +14546,7 @@ index 67bbd643dcf2..f1a5bc97fc2c 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -15677,7 +14633,7 @@ index 67bbd643dcf2..f1a5bc97fc2c 100644
Library("task_queue_gn")
diff --git third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build
-index 161cde130304..8e0139eafbb4 100644
+index b09ad121a6af..53e93cf4ca63 100644
--- third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build
+++ third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -15688,6 +14644,7 @@ index 161cde130304..8e0139eafbb4 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -15696,13 +14653,12 @@ index 161cde130304..8e0139eafbb4 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15737,7 +14693,6 @@ index 161cde130304..8e0139eafbb4 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -15787,7 +14742,7 @@ index 161cde130304..8e0139eafbb4 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -15813,7 +14768,7 @@ index 161cde130304..8e0139eafbb4 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -15855,7 +14810,7 @@ index 161cde130304..8e0139eafbb4 100644
-
Library("bandwidth_estimation_settings_gn")
diff --git third_party/libwebrtc/api/transport/bandwidth_usage_gn/moz.build third_party/libwebrtc/api/transport/bandwidth_usage_gn/moz.build
-index f8ad511f0820..5b490cc8b03c 100644
+index a6b96ce34164..d6a055dc77ba 100644
--- third_party/libwebrtc/api/transport/bandwidth_usage_gn/moz.build
+++ third_party/libwebrtc/api/transport/bandwidth_usage_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -15866,6 +14821,7 @@ index f8ad511f0820..5b490cc8b03c 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -15874,13 +14830,12 @@ index f8ad511f0820..5b490cc8b03c 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15915,7 +14870,6 @@ index f8ad511f0820..5b490cc8b03c 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -15965,7 +14919,7 @@ index f8ad511f0820..5b490cc8b03c 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -15991,7 +14945,7 @@ index f8ad511f0820..5b490cc8b03c 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -16033,18 +14987,10 @@ index f8ad511f0820..5b490cc8b03c 100644
-
Library("bandwidth_usage_gn")
diff --git third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
-index 15a02a15ec22..47b4ba15b41c 100644
+index 1f1d1c4c736a..ce48d9240524 100644
--- third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
+++ third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -16052,6 +14998,7 @@ index 15a02a15ec22..47b4ba15b41c 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -16060,23 +15007,18 @@ index 15a02a15ec22..47b4ba15b41c 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,103 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -16091,10 +15033,6 @@ index 15a02a15ec22..47b4ba15b41c 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -16102,10 +15040,6 @@ index 15a02a15ec22..47b4ba15b41c 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -16113,7 +15047,6 @@ index 15a02a15ec22..47b4ba15b41c 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -16121,10 +15054,6 @@ index 15a02a15ec22..47b4ba15b41c 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -16137,10 +15066,6 @@ index 15a02a15ec22..47b4ba15b41c 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -16171,7 +15096,7 @@ index 15a02a15ec22..47b4ba15b41c 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -150,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -16229,10 +15154,10 @@ index 15a02a15ec22..47b4ba15b41c 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -16243,10 +15168,10 @@ index 15a02a15ec22..47b4ba15b41c 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -16258,7 +15183,7 @@ index 15a02a15ec22..47b4ba15b41c 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 86faea91265a..d33ba400e8de 100644
+index cee851fd0446..b16ccce6f104 100644
--- third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
+++ third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -16269,6 +15194,7 @@ index 86faea91265a..d33ba400e8de 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -16277,13 +15203,12 @@ index 86faea91265a..d33ba400e8de 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16322,7 +15247,6 @@ index 86faea91265a..d33ba400e8de 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -16379,7 +15303,7 @@ index 86faea91265a..d33ba400e8de 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -16405,7 +15329,7 @@ index 86faea91265a..d33ba400e8de 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -16447,7 +15371,7 @@ index 86faea91265a..d33ba400e8de 100644
-
Library("datagram_transport_interface_gn")
diff --git third_party/libwebrtc/api/transport/ecn_marking_gn/moz.build third_party/libwebrtc/api/transport/ecn_marking_gn/moz.build
-index 208ee8847f83..208719b03b57 100644
+index d398fe8173ce..de8ef38e2bbc 100644
--- third_party/libwebrtc/api/transport/ecn_marking_gn/moz.build
+++ third_party/libwebrtc/api/transport/ecn_marking_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -16458,6 +15382,7 @@ index 208ee8847f83..208719b03b57 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -16466,13 +15391,12 @@ index 208ee8847f83..208719b03b57 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16507,7 +15431,6 @@ index 208ee8847f83..208719b03b57 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -16557,7 +15480,7 @@ index 208ee8847f83..208719b03b57 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -16583,7 +15506,7 @@ index 208ee8847f83..208719b03b57 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -16624,19 +15547,11 @@ index 208ee8847f83..208719b03b57 100644
- DEFINES["_GNU_SOURCE"] = True
-
Library("ecn_marking_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 2e54542f5291..a73c2a391505 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+diff --git third_party/libwebrtc/api/transport/goog_cc_gn/moz.build third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
+index 0ea320c48cb1..7f4d08190fbd 100644
+--- third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
++++ third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -16644,6 +15559,7 @@ index 2e54542f5291..a73c2a391505 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -16652,23 +15568,18 @@ index 2e54542f5291..a73c2a391505 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -16682,15 +15593,12 @@ index 2e54542f5291..a73c2a391505 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
+- "GLESv2",
- "log"
- ]
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -16698,10 +15606,6 @@ index 2e54542f5291..a73c2a391505 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -16709,7 +15613,6 @@ index 2e54542f5291..a73c2a391505 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -16717,10 +15620,6 @@ index 2e54542f5291..a73c2a391505 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -16733,10 +15632,6 @@ index 2e54542f5291..a73c2a391505 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -16774,7 +15669,7 @@ index 2e54542f5291..a73c2a391505 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -16832,10 +15727,10 @@ index 2e54542f5291..a73c2a391505 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -16846,10 +15741,10 @@ index 2e54542f5291..a73c2a391505 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -16859,20 +15754,12 @@ index 2e54542f5291..a73c2a391505 100644
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- Library("field_trial_based_config_gn")
-diff --git third_party/libwebrtc/api/transport/goog_cc_gn/moz.build third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
-index 7a66e70ca013..3f3045103dce 100644
---- third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
-+++ third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("goog_cc_gn")
+diff --git third_party/libwebrtc/api/transport/network_control_gn/moz.build third_party/libwebrtc/api/transport/network_control_gn/moz.build
+index 3daf12907a25..fe17cc7e3b41 100644
+--- third_party/libwebrtc/api/transport/network_control_gn/moz.build
++++ third_party/libwebrtc/api/transport/network_control_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -16880,6 +15767,7 @@ index 7a66e70ca013..3f3045103dce 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -16888,23 +15776,18 @@ index 7a66e70ca013..3f3045103dce 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -16918,16 +15801,11 @@ index 7a66e70ca013..3f3045103dce 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -16935,10 +15813,6 @@ index 7a66e70ca013..3f3045103dce 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -16946,7 +15820,6 @@ index 7a66e70ca013..3f3045103dce 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -16954,10 +15827,6 @@ index 7a66e70ca013..3f3045103dce 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -16970,10 +15839,6 @@ index 7a66e70ca013..3f3045103dce 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -17011,7 +15876,7 @@ index 7a66e70ca013..3f3045103dce 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -17069,10 +15934,10 @@ index 7a66e70ca013..3f3045103dce 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -17083,10 +15948,10 @@ index 7a66e70ca013..3f3045103dce 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -17096,20 +15961,12 @@ index 7a66e70ca013..3f3045103dce 100644
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 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 c901772b804b..f439f12a64a0 100644
---- third_party/libwebrtc/api/transport/network_control_gn/moz.build
-+++ third_party/libwebrtc/api/transport/network_control_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("network_control_gn")
+diff --git third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build
+index ae81701a1bd9..8f83c4414424 100644
+--- third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build
++++ third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -17117,6 +15974,7 @@ index c901772b804b..f439f12a64a0 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -17125,23 +15983,18 @@ index c901772b804b..f439f12a64a0 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -17160,10 +16013,6 @@ index c901772b804b..f439f12a64a0 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -17171,10 +16020,6 @@ index c901772b804b..f439f12a64a0 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -17182,7 +16027,6 @@ index c901772b804b..f439f12a64a0 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -17190,10 +16034,6 @@ index c901772b804b..f439f12a64a0 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -17206,10 +16046,6 @@ index c901772b804b..f439f12a64a0 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -17236,18 +16072,11 @@ index c901772b804b..f439f12a64a0 100644
- DEFINES["_WINDOWS"] = True
- DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
- DEFINES["__STD_C"] = True
--
-- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
-- "winmm"
-- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -17305,10 +16134,10 @@ index c901772b804b..f439f12a64a0 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -17319,10 +16148,10 @@ index c901772b804b..f439f12a64a0 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -17332,11 +16161,11 @@ index c901772b804b..f439f12a64a0 100644
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- Library("network_control_gn")
-diff --git third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build
-index b6e01a151f48..858f49e8ebc3 100644
---- third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build
-+++ third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build
+ Library("corruption_detection_message_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 c491583efb60..d0cc148b59ed 100644
+--- third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
++++ third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -17345,6 +16174,7 @@ index b6e01a151f48..858f49e8ebc3 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -17353,13 +16183,12 @@ index b6e01a151f48..858f49e8ebc3 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17398,7 +16227,6 @@ index b6e01a151f48..858f49e8ebc3 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -17448,12 +16276,16 @@ index b6e01a151f48..858f49e8ebc3 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
-if CONFIG["TARGET_CPU"] == "arm":
-
+- CXXFLAGS += [
+- "-mfpu=neon"
+- ]
+-
- DEFINES["WEBRTC_ARCH_ARM"] = True
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
@@ -17474,10 +16306,12 @@ index b6e01a151f48..858f49e8ebc3 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
-
- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["TARGET_CPU"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -17498,6 +16332,12 @@ index b6e01a151f48..858f49e8ebc3 100644
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
+-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -17508,26 +16348,25 @@ index b6e01a151f48..858f49e8ebc3 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
-- DEFINES["_GNU_SOURCE"] = True
+- CXXFLAGS += [
+- "-msse2"
+- ]
-
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
--
++if CONFIG["TARGET_CPU"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("corruption_detection_message_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 d90f5c1fff26..aa6d3855421a 100644
---- third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
-+++ third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("dependency_descriptor_gn")
+diff --git third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
+index cb0e7defe522..793859a3646e 100644
+--- third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
++++ third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -17535,6 +16374,7 @@ index d90f5c1fff26..aa6d3855421a 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -17543,23 +16383,18 @@ index d90f5c1fff26..aa6d3855421a 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -17578,10 +16413,6 @@ index d90f5c1fff26..aa6d3855421a 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -17589,10 +16420,6 @@ index d90f5c1fff26..aa6d3855421a 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -17600,7 +16427,6 @@ index d90f5c1fff26..aa6d3855421a 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -17608,10 +16434,6 @@ index d90f5c1fff26..aa6d3855421a 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -17624,10 +16446,6 @@ index d90f5c1fff26..aa6d3855421a 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -17654,20 +16472,23 @@ index d90f5c1fff26..aa6d3855421a 100644
- DEFINES["_WINDOWS"] = True
- DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
- DEFINES["__STD_C"] = True
+-
+- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
+- "winmm"
+- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
-if CONFIG["TARGET_CPU"] == "arm":
-
-- CXXFLAGS += [
-- "-mfpu=neon"
-- ]
--
- DEFINES["WEBRTC_ARCH_ARM"] = True
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
@@ -17688,12 +16509,10 @@ index d90f5c1fff26..aa6d3855421a 100644
if CONFIG["TARGET_CPU"] == "x86":
-- DEFINES["WEBRTC_ENABLE_AVX2"] = True
--
--if CONFIG["TARGET_CPU"] == "x86_64":
--
-- DEFINES["WEBRTC_ENABLE_AVX2"] = True
--
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -17714,12 +16533,6 @@ index d90f5c1fff26..aa6d3855421a 100644
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
- CXXFLAGS += [
- "-msse2"
- ]
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -17730,24 +16543,17 @@ index d90f5c1fff26..aa6d3855421a 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- DEFINES["_GNU_SOURCE"] = True
-+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
+-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["TARGET_CPU"] == "x86_64":
-
+-
- DEFINES["_GNU_SOURCE"] = True
-+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
- 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 04dea7a88a95..4a75f1179c77 100644
---- third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
-+++ third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
+-
+ 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 d04fea40304d..204fddb0f9fe 100644
+--- third_party/libwebrtc/api/transport/stun_types_gn/moz.build
++++ third_party/libwebrtc/api/transport/stun_types_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -17756,6 +16562,7 @@ index 04dea7a88a95..4a75f1179c77 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -17764,13 +16571,12 @@ index 04dea7a88a95..4a75f1179c77 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17789,10 +16595,6 @@ index 04dea7a88a95..4a75f1179c77 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "log"
-- ]
--
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -17809,7 +16611,6 @@ index 04dea7a88a95..4a75f1179c77 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -17855,18 +16656,11 @@ index 04dea7a88a95..4a75f1179c77 100644
- DEFINES["_WINDOWS"] = True
- DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
- DEFINES["__STD_C"] = True
--
-- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
-- "winmm"
-- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -17892,7 +16686,7 @@ index 04dea7a88a95..4a75f1179c77 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -17932,11 +16726,11 @@ index 04dea7a88a95..4a75f1179c77 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- 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 1df2fbf24564..19472d624dec 100644
---- third_party/libwebrtc/api/transport/stun_types_gn/moz.build
-+++ third_party/libwebrtc/api/transport/stun_types_gn/moz.build
+ 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 7af13124c2db..c979fda6e5bc 100644
+--- third_party/libwebrtc/api/transport_api_gn/moz.build
++++ third_party/libwebrtc/api/transport_api_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -17945,6 +16739,7 @@ index 1df2fbf24564..19472d624dec 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -17953,13 +16748,12 @@ index 1df2fbf24564..19472d624dec 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17978,6 +16772,10 @@ index 1df2fbf24564..19472d624dec 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -17994,7 +16792,6 @@ index 1df2fbf24564..19472d624dec 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -18044,12 +16841,16 @@ index 1df2fbf24564..19472d624dec 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
-if CONFIG["TARGET_CPU"] == "arm":
-
+- CXXFLAGS += [
+- "-mfpu=neon"
+- ]
+-
- DEFINES["WEBRTC_ARCH_ARM"] = True
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
@@ -18070,10 +16871,12 @@ index 1df2fbf24564..19472d624dec 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
-
- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["TARGET_CPU"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -18094,6 +16897,12 @@ index 1df2fbf24564..19472d624dec 100644
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
+-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -18104,26 +16913,25 @@ index 1df2fbf24564..19472d624dec 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
-- DEFINES["_GNU_SOURCE"] = True
+- CXXFLAGS += [
+- "-msse2"
+- ]
-
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
--
++if CONFIG["TARGET_CPU"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
- 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 ae593f92c78f..6d7690536e17 100644
---- third_party/libwebrtc/api/transport_api_gn/moz.build
-+++ third_party/libwebrtc/api/transport_api_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("transport_api_gn")
+diff --git third_party/libwebrtc/api/units/data_rate_gn/moz.build third_party/libwebrtc/api/units/data_rate_gn/moz.build
+index 1b35b7cf5a8a..14ba2c78be54 100644
+--- third_party/libwebrtc/api/units/data_rate_gn/moz.build
++++ third_party/libwebrtc/api/units/data_rate_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -18131,6 +16939,7 @@ index ae593f92c78f..6d7690536e17 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -18139,23 +16948,18 @@ index ae593f92c78f..6d7690536e17 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -18174,10 +16978,6 @@ index ae593f92c78f..6d7690536e17 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -18185,10 +16985,6 @@ index ae593f92c78f..6d7690536e17 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -18196,7 +16992,6 @@ index ae593f92c78f..6d7690536e17 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -18204,10 +16999,6 @@ index ae593f92c78f..6d7690536e17 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -18220,10 +17011,6 @@ index ae593f92c78f..6d7690536e17 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -18254,7 +17041,7 @@ index ae593f92c78f..6d7690536e17 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -18339,20 +17126,12 @@ index ae593f92c78f..6d7690536e17 100644
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 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 5cd3be22e3be..d24a6c085e9e 100644
---- third_party/libwebrtc/api/units/data_rate_gn/moz.build
-+++ third_party/libwebrtc/api/units/data_rate_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("data_rate_gn")
+diff --git third_party/libwebrtc/api/units/data_size_gn/moz.build third_party/libwebrtc/api/units/data_size_gn/moz.build
+index 6f099efeb030..ed647bda87f0 100644
+--- third_party/libwebrtc/api/units/data_size_gn/moz.build
++++ third_party/libwebrtc/api/units/data_size_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -18360,6 +17139,7 @@ index 5cd3be22e3be..d24a6c085e9e 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -18368,23 +17148,18 @@ index 5cd3be22e3be..d24a6c085e9e 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -18403,10 +17178,6 @@ index 5cd3be22e3be..d24a6c085e9e 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -18414,10 +17185,6 @@ index 5cd3be22e3be..d24a6c085e9e 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -18425,7 +17192,6 @@ index 5cd3be22e3be..d24a6c085e9e 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -18433,10 +17199,6 @@ index 5cd3be22e3be..d24a6c085e9e 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -18449,10 +17211,6 @@ index 5cd3be22e3be..d24a6c085e9e 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -18483,7 +17241,7 @@ index 5cd3be22e3be..d24a6c085e9e 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -18568,20 +17326,12 @@ index 5cd3be22e3be..d24a6c085e9e 100644
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 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 d7ed81461302..f3c3b04ba2dc 100644
---- third_party/libwebrtc/api/units/data_size_gn/moz.build
-+++ third_party/libwebrtc/api/units/data_size_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("data_size_gn")
+diff --git third_party/libwebrtc/api/units/frequency_gn/moz.build third_party/libwebrtc/api/units/frequency_gn/moz.build
+index deea0df50db3..d23c1b6e2035 100644
+--- third_party/libwebrtc/api/units/frequency_gn/moz.build
++++ third_party/libwebrtc/api/units/frequency_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -18589,6 +17339,7 @@ index d7ed81461302..f3c3b04ba2dc 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -18597,23 +17348,18 @@ index d7ed81461302..f3c3b04ba2dc 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -18632,10 +17378,6 @@ index d7ed81461302..f3c3b04ba2dc 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -18643,10 +17385,6 @@ index d7ed81461302..f3c3b04ba2dc 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -18654,7 +17392,6 @@ index d7ed81461302..f3c3b04ba2dc 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -18662,10 +17399,6 @@ index d7ed81461302..f3c3b04ba2dc 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -18678,10 +17411,6 @@ index d7ed81461302..f3c3b04ba2dc 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -18712,7 +17441,7 @@ index d7ed81461302..f3c3b04ba2dc 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -18797,20 +17526,12 @@ index d7ed81461302..f3c3b04ba2dc 100644
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 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 7a0251439e48..fcaf081a5be8 100644
---- third_party/libwebrtc/api/units/frequency_gn/moz.build
-+++ third_party/libwebrtc/api/units/frequency_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("frequency_gn")
+diff --git third_party/libwebrtc/api/units/time_delta_gn/moz.build third_party/libwebrtc/api/units/time_delta_gn/moz.build
+index 33ad19538d59..59b23badc5ef 100644
+--- third_party/libwebrtc/api/units/time_delta_gn/moz.build
++++ third_party/libwebrtc/api/units/time_delta_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -18818,6 +17539,7 @@ index 7a0251439e48..fcaf081a5be8 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -18826,23 +17548,18 @@ index 7a0251439e48..fcaf081a5be8 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -18861,10 +17578,6 @@ index 7a0251439e48..fcaf081a5be8 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -18872,10 +17585,6 @@ index 7a0251439e48..fcaf081a5be8 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -18883,7 +17592,6 @@ index 7a0251439e48..fcaf081a5be8 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -18891,10 +17599,6 @@ index 7a0251439e48..fcaf081a5be8 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -18907,10 +17611,6 @@ index 7a0251439e48..fcaf081a5be8 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -18941,7 +17641,7 @@ index 7a0251439e48..fcaf081a5be8 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -19026,20 +17726,12 @@ index 7a0251439e48..fcaf081a5be8 100644
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 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 33d1ff96cc22..b7676710e4e7 100644
---- third_party/libwebrtc/api/units/time_delta_gn/moz.build
-+++ third_party/libwebrtc/api/units/time_delta_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("time_delta_gn")
+diff --git third_party/libwebrtc/api/units/timestamp_gn/moz.build third_party/libwebrtc/api/units/timestamp_gn/moz.build
+index 5f80d61516fd..73a877084b26 100644
+--- third_party/libwebrtc/api/units/timestamp_gn/moz.build
++++ third_party/libwebrtc/api/units/timestamp_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -19047,6 +17739,7 @@ index 33d1ff96cc22..b7676710e4e7 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -19055,23 +17748,18 @@ index 33d1ff96cc22..b7676710e4e7 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -19090,10 +17778,6 @@ index 33d1ff96cc22..b7676710e4e7 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -19101,10 +17785,6 @@ index 33d1ff96cc22..b7676710e4e7 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -19112,7 +17792,6 @@ index 33d1ff96cc22..b7676710e4e7 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -19120,10 +17799,6 @@ index 33d1ff96cc22..b7676710e4e7 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -19136,10 +17811,6 @@ index 33d1ff96cc22..b7676710e4e7 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -19170,7 +17841,7 @@ index 33d1ff96cc22..b7676710e4e7 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -19255,20 +17926,12 @@ index 33d1ff96cc22..b7676710e4e7 100644
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 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 1c78d311f808..d839dbd4c05f 100644
---- third_party/libwebrtc/api/units/timestamp_gn/moz.build
-+++ third_party/libwebrtc/api/units/timestamp_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("timestamp_gn")
+diff --git third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
+index 5eb24e52173a..bae12fef07bf 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
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -19276,6 +17939,7 @@ index 1c78d311f808..d839dbd4c05f 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -19284,23 +17948,18 @@ index 1c78d311f808..d839dbd4c05f 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -19314,15 +17973,12 @@ index 1c78d311f808..d839dbd4c05f 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
+- "GLESv2",
- "log"
- ]
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -19330,10 +17986,6 @@ index 1c78d311f808..d839dbd4c05f 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -19341,7 +17993,6 @@ index 1c78d311f808..d839dbd4c05f 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -19349,10 +18000,209 @@ index 1c78d311f808..d839dbd4c05f 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["WEBRTC_BSD"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_FILE_OFFSET_BITS"] = "64"
+- DEFINES["_LARGEFILE64_SOURCE"] = True
+- DEFINES["_LARGEFILE_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+- DEFINES["NOMINMAX"] = True
+- DEFINES["NTDDI_VERSION"] = "0x0A000000"
+- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
+- DEFINES["UNICODE"] = True
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["WEBRTC_WIN"] = True
+- DEFINES["WIN32"] = True
+- DEFINES["WIN32_LEAN_AND_MEAN"] = True
+- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+- DEFINES["WINVER"] = "0x0A00"
+- DEFINES["_ATL_NO_OPENGL"] = True
+- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
+- DEFINES["_CRT_RAND_S"] = True
+- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
+- DEFINES["_HAS_EXCEPTIONS"] = "0"
+- DEFINES["_HAS_NODISCARD"] = True
+- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+- DEFINES["_SECURE_ATL"] = True
+- DEFINES["_UNICODE"] = True
+- DEFINES["_WIN32_WINNT"] = "0x0A00"
+- DEFINES["_WINDOWS"] = True
+- DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
+- DEFINES["__STD_C"] = True
+-
+- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
+- "winmm"
+- ]
++ DEFINES["_DEBUG"] = True
+
+ if CONFIG["TARGET_CPU"] == "aarch64":
+
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+ DEFINES["WEBRTC_HAS_NEON"] = True
+ DEFINES["__ARM_NEON__"] = "1"
+
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+- CXXFLAGS += [
+- "-mfpu=neon"
+- ]
+-
+- DEFINES["WEBRTC_ARCH_ARM"] = True
+- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["TARGET_CPU"] == "loongarch64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+ if CONFIG["TARGET_CPU"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["TARGET_CPU"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["TARGET_CPU"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
+-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+-
- CXXFLAGS += [
-- "-std=gnu++20"
+- "-msse2"
- ]
-
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
++if CONFIG["TARGET_CPU"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+ Library("builtin_video_bitrate_allocator_factory_gn")
+diff --git third_party/libwebrtc/api/video/corruption_detection/filter_settings_gn/moz.build third_party/libwebrtc/api/video/corruption_detection/filter_settings_gn/moz.build
+index e38f35fd89c4..7f0f4946ad7c 100644
+--- third_party/libwebrtc/api/video/corruption_detection/filter_settings_gn/moz.build
++++ third_party/libwebrtc/api/video/corruption_detection/filter_settings_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
++DEFINES["_FILE_OFFSET_BITS"] = "64"
++DEFINES["_LARGEFILE64_SOURCE"] = True
++DEFINES["_LARGEFILE_SOURCE"] = True
++DEFINES["__STDC_CONSTANT_MACROS"] = True
++DEFINES["__STDC_FORMAT_MACROS"] = True
+
+ FINAL_LIBRARY = "xul"
+
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_FILE_OFFSET_BITS"] = "64"
+- DEFINES["_LARGEFILE64_SOURCE"] = True
+- DEFINES["_LARGEFILE_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "OpenBSD":
+-
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -19365,10 +18215,187 @@ index 1c78d311f808..d839dbd4c05f 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
+- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+- DEFINES["NOMINMAX"] = True
+- DEFINES["NTDDI_VERSION"] = "0x0A000000"
+- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
+- DEFINES["UNICODE"] = True
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["WEBRTC_WIN"] = True
+- DEFINES["WIN32"] = True
+- DEFINES["WIN32_LEAN_AND_MEAN"] = True
+- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+- DEFINES["WINVER"] = "0x0A00"
+- DEFINES["_ATL_NO_OPENGL"] = True
+- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
+- DEFINES["_CRT_RAND_S"] = True
+- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
+- DEFINES["_HAS_EXCEPTIONS"] = "0"
+- DEFINES["_HAS_NODISCARD"] = True
+- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+- DEFINES["_SECURE_ATL"] = True
+- DEFINES["_UNICODE"] = True
+- DEFINES["_WIN32_WINNT"] = "0x0A00"
+- DEFINES["_WINDOWS"] = True
+- DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
+- DEFINES["__STD_C"] = True
++ DEFINES["_DEBUG"] = True
+
+ if CONFIG["TARGET_CPU"] == "aarch64":
+
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+ DEFINES["WEBRTC_HAS_NEON"] = True
+ DEFINES["__ARM_NEON__"] = "1"
+
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+- DEFINES["WEBRTC_ARCH_ARM"] = True
+- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["TARGET_CPU"] == "loongarch64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+ if CONFIG["TARGET_CPU"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["TARGET_CPU"] == "x86":
+
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+ Library("filter_settings_gn")
+diff --git third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_data_gn/moz.build third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_data_gn/moz.build
+index 784b4ebfa65a..5fd5f86f273b 100644
+--- third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_data_gn/moz.build
++++ third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_data_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
++DEFINES["_FILE_OFFSET_BITS"] = "64"
++DEFINES["_LARGEFILE64_SOURCE"] = True
++DEFINES["_LARGEFILE_SOURCE"] = True
++DEFINES["__STDC_CONSTANT_MACROS"] = True
++DEFINES["__STDC_FORMAT_MACROS"] = True
+
+ FINAL_LIBRARY = "xul"
+
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
- ]
-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_FILE_OFFSET_BITS"] = "64"
+- DEFINES["_LARGEFILE64_SOURCE"] = True
+- DEFINES["_LARGEFILE_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["WEBRTC_BSD"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_FILE_OFFSET_BITS"] = "64"
+- DEFINES["_LARGEFILE64_SOURCE"] = True
+- DEFINES["_LARGEFILE_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -19399,7 +18426,7 @@ index 1c78d311f808..d839dbd4c05f 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -19484,20 +18511,12 @@ index 1c78d311f808..d839dbd4c05f 100644
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 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 21396f2532b3..515f9ef7ce12 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("frame_instrumentation_data_gn")
+diff --git third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_data_reader_gn/moz.build third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_data_reader_gn/moz.build
+index f50de2a3968f..aac961573d3a 100644
+--- third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_data_reader_gn/moz.build
++++ third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_data_reader_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -19505,6 +18524,7 @@ index 21396f2532b3..515f9ef7ce12 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -19513,23 +18533,18 @@ index 21396f2532b3..515f9ef7ce12 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -19543,16 +18558,11 @@ index 21396f2532b3..515f9ef7ce12 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -19560,10 +18570,6 @@ index 21396f2532b3..515f9ef7ce12 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -19571,7 +18577,6 @@ index 21396f2532b3..515f9ef7ce12 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -19579,10 +18584,6 @@ index 21396f2532b3..515f9ef7ce12 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -19595,10 +18596,6 @@ index 21396f2532b3..515f9ef7ce12 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -19636,7 +18633,7 @@ index 21396f2532b3..515f9ef7ce12 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -19694,10 +18691,10 @@ index 21396f2532b3..515f9ef7ce12 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -19708,10 +18705,10 @@ index 21396f2532b3..515f9ef7ce12 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -19721,11 +18718,11 @@ index 21396f2532b3..515f9ef7ce12 100644
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- Library("builtin_video_bitrate_allocator_factory_gn")
-diff --git third_party/libwebrtc/api/video/corruption_detection_filter_settings_gn/moz.build third_party/libwebrtc/api/video/corruption_detection_filter_settings_gn/moz.build
-index 007b03f40df4..f35f563d51d6 100644
---- third_party/libwebrtc/api/video/corruption_detection_filter_settings_gn/moz.build
-+++ third_party/libwebrtc/api/video/corruption_detection_filter_settings_gn/moz.build
+ Library("frame_instrumentation_data_reader_gn")
+diff --git third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_evaluation_gn/moz.build third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_evaluation_gn/moz.build
+index 259f7cf19bd8..8e982b933563 100644
+--- third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_evaluation_gn/moz.build
++++ third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_evaluation_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -19734,6 +18731,7 @@ index 007b03f40df4..f35f563d51d6 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -19742,13 +18740,12 @@ index 007b03f40df4..f35f563d51d6 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19767,6 +18764,10 @@ index 007b03f40df4..f35f563d51d6 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -19783,7 +18784,6 @@ index 007b03f40df4..f35f563d51d6 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -19829,16 +18829,27 @@ index 007b03f40df4..f35f563d51d6 100644
- DEFINES["_WINDOWS"] = True
- DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
- DEFINES["__STD_C"] = True
+-
+- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
+- "winmm"
+- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
-if CONFIG["TARGET_CPU"] == "arm":
-
+- CXXFLAGS += [
+- "-mfpu=neon"
+- ]
+-
- DEFINES["WEBRTC_ARCH_ARM"] = True
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
@@ -19859,10 +18870,12 @@ index 007b03f40df4..f35f563d51d6 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
-
- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["TARGET_CPU"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -19883,6 +18896,12 @@ index 007b03f40df4..f35f563d51d6 100644
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
+-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -19893,26 +18912,25 @@ index 007b03f40df4..f35f563d51d6 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
-- DEFINES["_GNU_SOURCE"] = True
+- CXXFLAGS += [
+- "-msse2"
+- ]
-
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
--
++if CONFIG["TARGET_CPU"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("corruption_detection_filter_settings_gn")
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+ Library("frame_instrumentation_evaluation_gn")
diff --git third_party/libwebrtc/api/video/encoded_frame_gn/moz.build third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
-index ce7e805a6e46..80b0a7e36c3e 100644
+index f43d0c641ef3..d2b102c61127 100644
--- third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
+++ third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -19920,6 +18938,7 @@ index ce7e805a6e46..80b0a7e36c3e 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -19928,23 +18947,18 @@ index ce7e805a6e46..80b0a7e36c3e 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -19963,10 +18977,6 @@ index ce7e805a6e46..80b0a7e36c3e 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -19974,10 +18984,6 @@ index ce7e805a6e46..80b0a7e36c3e 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -19985,7 +18991,6 @@ index ce7e805a6e46..80b0a7e36c3e 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -19993,10 +18998,6 @@ index ce7e805a6e46..80b0a7e36c3e 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -20009,10 +19010,6 @@ index ce7e805a6e46..80b0a7e36c3e 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -20050,7 +19047,7 @@ index ce7e805a6e46..80b0a7e36c3e 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -20108,10 +19105,10 @@ index ce7e805a6e46..80b0a7e36c3e 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -20122,10 +19119,10 @@ index ce7e805a6e46..80b0a7e36c3e 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -20137,18 +19134,10 @@ index ce7e805a6e46..80b0a7e36c3e 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 ef3923f3f0a1..ab2df18f8879 100644
+index 858df454d82a..85fa5f6f2ae1 100644
--- third_party/libwebrtc/api/video/encoded_image_gn/moz.build
+++ third_party/libwebrtc/api/video/encoded_image_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -20156,6 +19145,7 @@ index ef3923f3f0a1..ab2df18f8879 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -20164,23 +19154,18 @@ index ef3923f3f0a1..ab2df18f8879 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -20199,10 +19184,6 @@ index ef3923f3f0a1..ab2df18f8879 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -20210,10 +19191,6 @@ index ef3923f3f0a1..ab2df18f8879 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -20221,7 +19198,6 @@ index ef3923f3f0a1..ab2df18f8879 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -20229,10 +19205,6 @@ index ef3923f3f0a1..ab2df18f8879 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -20245,10 +19217,6 @@ index ef3923f3f0a1..ab2df18f8879 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -20286,7 +19254,7 @@ index ef3923f3f0a1..ab2df18f8879 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -20344,10 +19312,10 @@ index ef3923f3f0a1..ab2df18f8879 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -20358,10 +19326,10 @@ index ef3923f3f0a1..ab2df18f8879 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -20373,18 +19341,10 @@ index ef3923f3f0a1..ab2df18f8879 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 976a6ff25651..01221e0c95b7 100644
+index 0e97349cfc77..068e9983902f 100644
--- third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
+++ third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -20392,6 +19352,7 @@ index 976a6ff25651..01221e0c95b7 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -20400,23 +19361,18 @@ index 976a6ff25651..01221e0c95b7 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -20436,10 +19392,6 @@ index 976a6ff25651..01221e0c95b7 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -20447,10 +19399,6 @@ index 976a6ff25651..01221e0c95b7 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -20458,7 +19406,6 @@ index 976a6ff25651..01221e0c95b7 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -20466,10 +19413,6 @@ index 976a6ff25651..01221e0c95b7 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -20482,10 +19425,6 @@ index 976a6ff25651..01221e0c95b7 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -20523,7 +19462,7 @@ index 976a6ff25651..01221e0c95b7 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -20581,10 +19520,10 @@ index 976a6ff25651..01221e0c95b7 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -20595,10 +19534,10 @@ index 976a6ff25651..01221e0c95b7 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -20610,7 +19549,7 @@ index 976a6ff25651..01221e0c95b7 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 90c39627ea9c..315daacff346 100644
+index dbe54e47fb98..9b136ac42704 100644
--- third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
+++ third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -20621,6 +19560,7 @@ index 90c39627ea9c..315daacff346 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -20629,13 +19569,12 @@ index 90c39627ea9c..315daacff346 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20674,7 +19613,6 @@ index 90c39627ea9c..315daacff346 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -20731,7 +19669,7 @@ index 90c39627ea9c..315daacff346 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -20757,7 +19695,7 @@ index 90c39627ea9c..315daacff346 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -20799,7 +19737,7 @@ index 90c39627ea9c..315daacff346 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 6b314536b258..9961eaa7d49b 100644
+index 84f9a2b2c68a..d15140c641c2 100644
--- third_party/libwebrtc/api/video/render_resolution_gn/moz.build
+++ third_party/libwebrtc/api/video/render_resolution_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -20810,6 +19748,7 @@ index 6b314536b258..9961eaa7d49b 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -20818,13 +19757,12 @@ index 6b314536b258..9961eaa7d49b 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20859,7 +19797,6 @@ index 6b314536b258..9961eaa7d49b 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -20909,7 +19846,7 @@ index 6b314536b258..9961eaa7d49b 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -20935,7 +19872,7 @@ index 6b314536b258..9961eaa7d49b 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -20977,7 +19914,7 @@ index 6b314536b258..9961eaa7d49b 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 04e2b1922e32..e6dbc2d6f88c 100644
+index 4a33d1cb0e9e..4080a7a25dd3 100644
--- third_party/libwebrtc/api/video/resolution_gn/moz.build
+++ third_party/libwebrtc/api/video/resolution_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -20988,6 +19925,7 @@ index 04e2b1922e32..e6dbc2d6f88c 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -20996,13 +19934,12 @@ index 04e2b1922e32..e6dbc2d6f88c 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21037,7 +19974,6 @@ index 04e2b1922e32..e6dbc2d6f88c 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -21087,7 +20023,7 @@ index 04e2b1922e32..e6dbc2d6f88c 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -21113,7 +20049,7 @@ index 04e2b1922e32..e6dbc2d6f88c 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -21155,18 +20091,10 @@ index 04e2b1922e32..e6dbc2d6f88c 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 d142cec6811b..5b0a157dee57 100644
+index 6c2807380aff..ad2ccb022fdc 100644
--- third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
+++ third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -21174,6 +20102,7 @@ index d142cec6811b..5b0a157dee57 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -21182,23 +20111,18 @@ index d142cec6811b..5b0a157dee57 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -21217,10 +20141,6 @@ index d142cec6811b..5b0a157dee57 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -21228,10 +20148,6 @@ index d142cec6811b..5b0a157dee57 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -21239,7 +20155,6 @@ index d142cec6811b..5b0a157dee57 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -21247,10 +20162,6 @@ index d142cec6811b..5b0a157dee57 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -21263,10 +20174,6 @@ index d142cec6811b..5b0a157dee57 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -21297,7 +20204,7 @@ index d142cec6811b..5b0a157dee57 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -21384,18 +20291,10 @@ index d142cec6811b..5b0a157dee57 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 8d1cc02953c4..1139199f56de 100644
+index a18df7dbd8f7..6343a67de50e 100644
--- third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
+++ third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -21403,6 +20302,7 @@ index 8d1cc02953c4..1139199f56de 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -21411,23 +20311,18 @@ index 8d1cc02953c4..1139199f56de 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -21446,10 +20341,6 @@ index 8d1cc02953c4..1139199f56de 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -21457,10 +20348,6 @@ index 8d1cc02953c4..1139199f56de 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -21468,7 +20355,6 @@ index 8d1cc02953c4..1139199f56de 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -21476,10 +20362,6 @@ index 8d1cc02953c4..1139199f56de 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -21492,10 +20374,6 @@ index 8d1cc02953c4..1139199f56de 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -21526,7 +20404,7 @@ index 8d1cc02953c4..1139199f56de 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -21613,7 +20491,7 @@ index 8d1cc02953c4..1139199f56de 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 d2bf0c7403d6..6be377872652 100644
+index 5091c53d089e..a62643cf926a 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -21624,6 +20502,7 @@ index d2bf0c7403d6..6be377872652 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -21632,13 +20511,12 @@ index d2bf0c7403d6..6be377872652 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21677,7 +20555,6 @@ index d2bf0c7403d6..6be377872652 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -21734,7 +20611,7 @@ index d2bf0c7403d6..6be377872652 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -21760,7 +20637,7 @@ index d2bf0c7403d6..6be377872652 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -21802,18 +20679,10 @@ index d2bf0c7403d6..6be377872652 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 53ac7e089c7a..c36c59f06b72 100644
+index 37a5eb0ed8c2..175739fe4569 100644
--- third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
+++ third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -21821,6 +20690,7 @@ index 53ac7e089c7a..c36c59f06b72 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -21829,23 +20699,18 @@ index 53ac7e089c7a..c36c59f06b72 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -21864,10 +20729,6 @@ index 53ac7e089c7a..c36c59f06b72 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -21875,10 +20736,6 @@ index 53ac7e089c7a..c36c59f06b72 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -21886,7 +20743,6 @@ index 53ac7e089c7a..c36c59f06b72 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -21894,10 +20750,6 @@ index 53ac7e089c7a..c36c59f06b72 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -21910,10 +20762,6 @@ index 53ac7e089c7a..c36c59f06b72 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -21944,7 +20792,7 @@ index 53ac7e089c7a..c36c59f06b72 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -22031,7 +20879,7 @@ index 53ac7e089c7a..c36c59f06b72 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 12364de002c7..3dcb2f1fa8a7 100644
+index 258360394b9b..0b37739d6af2 100644
--- third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
+++ third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -22042,6 +20890,7 @@ index 12364de002c7..3dcb2f1fa8a7 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -22050,13 +20899,12 @@ index 12364de002c7..3dcb2f1fa8a7 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22091,7 +20939,6 @@ index 12364de002c7..3dcb2f1fa8a7 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -22141,7 +20988,7 @@ index 12364de002c7..3dcb2f1fa8a7 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -22167,7 +21014,7 @@ index 12364de002c7..3dcb2f1fa8a7 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -22209,18 +21056,10 @@ index 12364de002c7..3dcb2f1fa8a7 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 0563038a395c..ea93de3e6bbf 100644
+index 002adff7180e..22b486c49f35 100644
--- third_party/libwebrtc/api/video/video_frame_gn/moz.build
+++ third_party/libwebrtc/api/video/video_frame_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -22228,6 +21067,7 @@ index 0563038a395c..ea93de3e6bbf 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -22236,23 +21076,18 @@ index 0563038a395c..ea93de3e6bbf 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -57,114 +70,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -57,93 +66,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -22271,10 +21106,6 @@ index 0563038a395c..ea93de3e6bbf 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -22282,10 +21113,6 @@ index 0563038a395c..ea93de3e6bbf 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -22293,7 +21120,6 @@ index 0563038a395c..ea93de3e6bbf 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -22301,10 +21127,6 @@ index 0563038a395c..ea93de3e6bbf 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -22317,10 +21139,6 @@ index 0563038a395c..ea93de3e6bbf 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -22358,7 +21176,7 @@ index 0563038a395c..ea93de3e6bbf 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -172,82 +78,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -151,82 +74,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -22416,10 +21234,10 @@ index 0563038a395c..ea93de3e6bbf 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -22430,10 +21248,10 @@ index 0563038a395c..ea93de3e6bbf 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -22445,18 +21263,10 @@ index 0563038a395c..ea93de3e6bbf 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 bfbd610a528b..3b78a97299cb 100644
+index 95be4b1cae96..99647b85c184 100644
--- third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
+++ third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -22464,6 +21274,7 @@ index bfbd610a528b..3b78a97299cb 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -22472,23 +21283,18 @@ index bfbd610a528b..3b78a97299cb 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -53,114 +66,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,93 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -22507,10 +21313,6 @@ index bfbd610a528b..3b78a97299cb 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -22518,10 +21320,6 @@ index bfbd610a528b..3b78a97299cb 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -22529,7 +21327,6 @@ index bfbd610a528b..3b78a97299cb 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -22537,10 +21334,6 @@ index bfbd610a528b..3b78a97299cb 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -22553,10 +21346,6 @@ index bfbd610a528b..3b78a97299cb 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -22594,7 +21383,7 @@ index bfbd610a528b..3b78a97299cb 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -168,82 +74,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -147,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -22652,10 +21441,10 @@ index bfbd610a528b..3b78a97299cb 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -22666,10 +21455,10 @@ index bfbd610a528b..3b78a97299cb 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -22681,18 +21470,10 @@ index bfbd610a528b..3b78a97299cb 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 75b269e2048f..732982ea8f93 100644
+index 874879d32abc..a472607df4b9 100644
--- third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
+++ third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -22700,6 +21481,7 @@ index 75b269e2048f..732982ea8f93 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -22708,23 +21490,18 @@ index 75b269e2048f..732982ea8f93 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -22743,10 +21520,6 @@ index 75b269e2048f..732982ea8f93 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -22754,10 +21527,6 @@ index 75b269e2048f..732982ea8f93 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -22765,7 +21534,6 @@ index 75b269e2048f..732982ea8f93 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -22773,10 +21541,6 @@ index 75b269e2048f..732982ea8f93 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -22789,10 +21553,6 @@ index 75b269e2048f..732982ea8f93 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -22830,7 +21590,7 @@ index 75b269e2048f..732982ea8f93 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -22888,10 +21648,10 @@ index 75b269e2048f..732982ea8f93 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -22902,10 +21662,10 @@ index 75b269e2048f..732982ea8f93 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -22917,7 +21677,7 @@ index 75b269e2048f..732982ea8f93 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 5935a6c894c2..095217577bc0 100644
+index 5c47765d9f2f..e05d85a65fe4 100644
--- third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
+++ third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -22928,6 +21688,7 @@ index 5935a6c894c2..095217577bc0 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -22936,13 +21697,12 @@ index 5935a6c894c2..095217577bc0 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22981,7 +21741,6 @@ index 5935a6c894c2..095217577bc0 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -23031,7 +21790,7 @@ index 5935a6c894c2..095217577bc0 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -23057,7 +21816,7 @@ index 5935a6c894c2..095217577bc0 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -23099,7 +21858,7 @@ index 5935a6c894c2..095217577bc0 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 af9ad6ff4c34..ad3d57b292f1 100644
+index 5628699424f6..23d72244a799 100644
--- third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
+++ third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -23110,6 +21869,7 @@ index af9ad6ff4c34..ad3d57b292f1 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -23118,13 +21878,12 @@ index af9ad6ff4c34..ad3d57b292f1 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23163,7 +21922,6 @@ index af9ad6ff4c34..ad3d57b292f1 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -23213,7 +21971,7 @@ index af9ad6ff4c34..ad3d57b292f1 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -23239,7 +21997,7 @@ index af9ad6ff4c34..ad3d57b292f1 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -23281,18 +22039,10 @@ index af9ad6ff4c34..ad3d57b292f1 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 7c66b583afd8..ff59a9c613f9 100644
+index 99588de22230..e3d29e8670c4 100644
--- third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
+++ third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -23300,6 +22050,7 @@ index 7c66b583afd8..ff59a9c613f9 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -23308,23 +22059,18 @@ index 7c66b583afd8..ff59a9c613f9 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -49,114 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -23343,10 +22089,6 @@ index 7c66b583afd8..ff59a9c613f9 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -23354,10 +22096,6 @@ index 7c66b583afd8..ff59a9c613f9 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -23365,7 +22103,6 @@ index 7c66b583afd8..ff59a9c613f9 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -23373,10 +22110,6 @@ index 7c66b583afd8..ff59a9c613f9 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -23389,10 +22122,6 @@ index 7c66b583afd8..ff59a9c613f9 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -23430,7 +22159,7 @@ index 7c66b583afd8..ff59a9c613f9 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -164,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -23488,10 +22217,10 @@ index 7c66b583afd8..ff59a9c613f9 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -23502,10 +22231,10 @@ index 7c66b583afd8..ff59a9c613f9 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -23517,7 +22246,7 @@ index 7c66b583afd8..ff59a9c613f9 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 a006d12053d8..21688646efab 100644
+index 23e709e46e9c..4df907e99963 100644
--- third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
+++ third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -23528,6 +22257,7 @@ index a006d12053d8..21688646efab 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -23536,13 +22266,12 @@ index a006d12053d8..21688646efab 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23581,7 +22310,6 @@ index a006d12053d8..21688646efab 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -23638,7 +22366,7 @@ index a006d12053d8..21688646efab 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -23664,7 +22392,7 @@ index a006d12053d8..21688646efab 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -23706,7 +22434,7 @@ index a006d12053d8..21688646efab 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 07c2bb5faf09..ab4917f08c5b 100644
+index 6e26714bac12..b20f7bf51dff 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -23717,6 +22445,7 @@ index 07c2bb5faf09..ab4917f08c5b 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -23725,13 +22454,12 @@ index 07c2bb5faf09..ab4917f08c5b 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23770,7 +22498,6 @@ index 07c2bb5faf09..ab4917f08c5b 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -23820,7 +22547,7 @@ index 07c2bb5faf09..ab4917f08c5b 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -23846,7 +22573,7 @@ index 07c2bb5faf09..ab4917f08c5b 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -23888,18 +22615,10 @@ index 07c2bb5faf09..ab4917f08c5b 100644
-
Library("bitstream_parser_api_gn")
diff --git third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build
-index 8395acf5481d..5b5ee908771a 100644
+index 67ef507d3097..7c7190358344 100644
--- third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -23907,6 +22626,7 @@ index 8395acf5481d..5b5ee908771a 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -23915,23 +22635,18 @@ index 8395acf5481d..5b5ee908771a 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -23951,10 +22666,6 @@ index 8395acf5481d..5b5ee908771a 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -23962,10 +22673,6 @@ index 8395acf5481d..5b5ee908771a 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -23973,7 +22680,6 @@ index 8395acf5481d..5b5ee908771a 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -23981,10 +22687,6 @@ index 8395acf5481d..5b5ee908771a 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -23997,10 +22699,6 @@ index 8395acf5481d..5b5ee908771a 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -24038,7 +22736,7 @@ index 8395acf5481d..5b5ee908771a 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -24096,10 +22794,10 @@ index 8395acf5481d..5b5ee908771a 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -24110,10 +22808,10 @@ index 8395acf5481d..5b5ee908771a 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -24125,18 +22823,10 @@ index 8395acf5481d..5b5ee908771a 100644
Library("builtin_video_decoder_factory_gn")
diff --git third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
-index 83b3e5382450..56d24eb49b3a 100644
+index 86d649512c50..b757e05614e6 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -24144,6 +22834,7 @@ index 83b3e5382450..56d24eb49b3a 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -24152,23 +22843,18 @@ index 83b3e5382450..56d24eb49b3a 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,115 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -24188,10 +22874,6 @@ index 83b3e5382450..56d24eb49b3a 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -24199,10 +22881,6 @@ index 83b3e5382450..56d24eb49b3a 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -24210,7 +22888,6 @@ index 83b3e5382450..56d24eb49b3a 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -24218,10 +22895,6 @@ index 83b3e5382450..56d24eb49b3a 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -24234,10 +22907,6 @@ index 83b3e5382450..56d24eb49b3a 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -24275,7 +22944,7 @@ index 83b3e5382450..56d24eb49b3a 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -163,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -24333,10 +23002,10 @@ index 83b3e5382450..56d24eb49b3a 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -24347,10 +23016,10 @@ index 83b3e5382450..56d24eb49b3a 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -24362,18 +23031,10 @@ index 83b3e5382450..56d24eb49b3a 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 661ac13346af..289cbee55009 100644
+index a6663bb723e5..d08276393a91 100644
--- third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -24381,6 +23042,7 @@ index 661ac13346af..289cbee55009 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -24389,23 +23051,18 @@ index 661ac13346af..289cbee55009 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -24424,10 +23081,6 @@ index 661ac13346af..289cbee55009 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -24435,10 +23088,6 @@ index 661ac13346af..289cbee55009 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -24446,7 +23095,6 @@ index 661ac13346af..289cbee55009 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -24454,10 +23102,6 @@ index 661ac13346af..289cbee55009 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -24470,10 +23114,6 @@ index 661ac13346af..289cbee55009 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -24504,7 +23144,7 @@ index 661ac13346af..289cbee55009 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -24591,18 +23231,10 @@ index 661ac13346af..289cbee55009 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 da45996c83c0..055e6ae6e83b 100644
+index 32e58da25377..fb69cedb88b3 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -24610,6 +23242,7 @@ index da45996c83c0..055e6ae6e83b 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -24618,23 +23251,18 @@ index da45996c83c0..055e6ae6e83b 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -56,114 +69,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -56,93 +65,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -24653,10 +23281,6 @@ index da45996c83c0..055e6ae6e83b 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -24664,10 +23288,6 @@ index da45996c83c0..055e6ae6e83b 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -24675,7 +23295,6 @@ index da45996c83c0..055e6ae6e83b 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -24683,10 +23302,6 @@ index da45996c83c0..055e6ae6e83b 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -24699,10 +23314,6 @@ index da45996c83c0..055e6ae6e83b 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -24740,7 +23351,7 @@ index da45996c83c0..055e6ae6e83b 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -171,82 +77,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -150,82 +73,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -24798,10 +23409,10 @@ index da45996c83c0..055e6ae6e83b 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -24812,10 +23423,10 @@ index da45996c83c0..055e6ae6e83b 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -24827,7 +23438,7 @@ index da45996c83c0..055e6ae6e83b 100644
Library("video_codecs_api_gn")
diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build
-index 1a9164e7e41c..c76c9a3552d7 100644
+index 4ace541c8629..1ba39e749117 100644
--- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -24838,6 +23449,7 @@ index 1a9164e7e41c..c76c9a3552d7 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -24846,13 +23458,12 @@ index 1a9164e7e41c..c76c9a3552d7 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24891,7 +23502,6 @@ index 1a9164e7e41c..c76c9a3552d7 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -24948,7 +23558,7 @@ index 1a9164e7e41c..c76c9a3552d7 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -24974,7 +23584,7 @@ index 1a9164e7e41c..c76c9a3552d7 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -25016,7 +23626,7 @@ index 1a9164e7e41c..c76c9a3552d7 100644
-
Library("video_encoder_factory_template_gn")
diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build
-index a8b930a85b6b..b22b0a732179 100644
+index 2a97afcba467..cc35215f7f73 100644
--- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -25027,6 +23637,7 @@ index a8b930a85b6b..b22b0a732179 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -25035,7 +23646,6 @@ index a8b930a85b6b..b22b0a732179 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
@@ -25061,6 +23671,7 @@ index a8b930a85b6b..b22b0a732179 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
+- "GLESv2",
- "log"
- ]
-
@@ -25080,7 +23691,6 @@ index a8b930a85b6b..b22b0a732179 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -25205,7 +23815,7 @@ index a8b930a85b6b..b22b0a732179 100644
-
Library("video_encoder_factory_template_libaom_av1_adapter_gn")
diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build
-index 9dac3c93b2a3..db12a5af1e46 100644
+index 0ed909d22eaa..30b36e992434 100644
--- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -25216,6 +23826,7 @@ index 9dac3c93b2a3..db12a5af1e46 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -25224,13 +23835,12 @@ index 9dac3c93b2a3..db12a5af1e46 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,95 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25270,7 +23880,6 @@ index 9dac3c93b2a3..db12a5af1e46 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -25327,7 +23936,7 @@ index 9dac3c93b2a3..db12a5af1e46 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -25353,7 +23962,7 @@ index 9dac3c93b2a3..db12a5af1e46 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -166,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -25395,7 +24004,7 @@ index 9dac3c93b2a3..db12a5af1e46 100644
-
Library("video_encoder_factory_template_libvpx_vp8_adapter_gn")
diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build
-index 0eef288f971c..1bb0b123d76f 100644
+index 35016b696d1f..c7733ec4e5b5 100644
--- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -25406,6 +24015,7 @@ index 0eef288f971c..1bb0b123d76f 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -25414,13 +24024,12 @@ index 0eef288f971c..1bb0b123d76f 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,95 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25460,7 +24069,6 @@ index 0eef288f971c..1bb0b123d76f 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -25517,7 +24125,7 @@ index 0eef288f971c..1bb0b123d76f 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -25543,7 +24151,7 @@ index 0eef288f971c..1bb0b123d76f 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -166,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -25585,7 +24193,7 @@ index 0eef288f971c..1bb0b123d76f 100644
-
Library("video_encoder_factory_template_libvpx_vp9_adapter_gn")
diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build
-index 62b95f84fd54..c3611901cec2 100644
+index d6781fc429cb..e8a512374002 100644
--- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -25596,6 +24204,7 @@ index 62b95f84fd54..c3611901cec2 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -25604,13 +24213,12 @@ index 62b95f84fd54..c3611901cec2 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,95 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25650,7 +24258,6 @@ index 62b95f84fd54..c3611901cec2 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -25707,7 +24314,7 @@ index 62b95f84fd54..c3611901cec2 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -25733,7 +24340,7 @@ index 62b95f84fd54..c3611901cec2 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -166,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -25775,18 +24382,10 @@ index 62b95f84fd54..c3611901cec2 100644
-
Library("video_encoder_factory_template_open_h264_adapter_gn")
diff --git third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
-index 287b47573441..8987834c3404 100644
+index 0da2c0072645..528d6c674073 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -25794,6 +24393,7 @@ index 287b47573441..8987834c3404 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -25802,23 +24402,18 @@ index 287b47573441..8987834c3404 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -25838,10 +24433,6 @@ index 287b47573441..8987834c3404 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -25849,10 +24440,6 @@ index 287b47573441..8987834c3404 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -25860,7 +24447,6 @@ index 287b47573441..8987834c3404 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -25868,10 +24454,6 @@ index 287b47573441..8987834c3404 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -25884,10 +24466,6 @@ index 287b47573441..8987834c3404 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -25925,7 +24503,7 @@ index 287b47573441..8987834c3404 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -25983,10 +24561,10 @@ index 287b47573441..8987834c3404 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -25997,10 +24575,10 @@ index 287b47573441..8987834c3404 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -26012,7 +24590,7 @@ index 287b47573441..8987834c3404 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 2ea47a17004e..60fc36572eb3 100644
+index eff44f748eb9..999796fa561f 100644
--- third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
+++ third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -26023,6 +24601,7 @@ index 2ea47a17004e..60fc36572eb3 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -26031,13 +24610,12 @@ index 2ea47a17004e..60fc36572eb3 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26072,7 +24650,6 @@ index 2ea47a17004e..60fc36572eb3 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -26122,7 +24699,7 @@ index 2ea47a17004e..60fc36572eb3 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -26148,7 +24725,7 @@ index 2ea47a17004e..60fc36572eb3 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -26190,18 +24767,10 @@ index 2ea47a17004e..60fc36572eb3 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 0f6558106fa3..8713480a7a16 100644
+index 61c208cfe98b..2668ec4480d4 100644
--- third_party/libwebrtc/audio/audio_gn/moz.build
+++ third_party/libwebrtc/audio/audio_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -26209,6 +24778,7 @@ index 0f6558106fa3..8713480a7a16 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -26217,23 +24787,18 @@ index 0f6558106fa3..8713480a7a16 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -58,115 +71,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -58,94 +67,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -26253,10 +24818,6 @@ index 0f6558106fa3..8713480a7a16 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -26264,10 +24825,6 @@ index 0f6558106fa3..8713480a7a16 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -26275,7 +24832,6 @@ index 0f6558106fa3..8713480a7a16 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -26283,10 +24839,6 @@ index 0f6558106fa3..8713480a7a16 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -26299,10 +24851,6 @@ index 0f6558106fa3..8713480a7a16 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -26340,7 +24888,7 @@ index 0f6558106fa3..8713480a7a16 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -174,82 +79,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -153,82 +75,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -26398,10 +24946,10 @@ index 0f6558106fa3..8713480a7a16 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -26412,10 +24960,10 @@ index 0f6558106fa3..8713480a7a16 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -26427,18 +24975,10 @@ index 0f6558106fa3..8713480a7a16 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 c9e14552b453..266fce02a468 100644
+index 00a2557568ab..d2a840371942 100644
--- third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
+++ third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -26446,6 +24986,7 @@ index c9e14552b453..266fce02a468 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -26454,23 +24995,18 @@ index c9e14552b453..266fce02a468 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -48,114 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -26489,10 +25025,6 @@ index c9e14552b453..266fce02a468 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -26500,10 +25032,6 @@ index c9e14552b453..266fce02a468 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -26511,7 +25039,6 @@ index c9e14552b453..266fce02a468 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -26519,10 +25046,6 @@ index c9e14552b453..266fce02a468 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -26535,10 +25058,6 @@ index c9e14552b453..266fce02a468 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -26576,7 +25095,7 @@ index c9e14552b453..266fce02a468 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -163,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -26634,10 +25153,10 @@ index c9e14552b453..266fce02a468 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -26648,10 +25167,10 @@ index c9e14552b453..266fce02a468 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -26663,18 +25182,10 @@ index c9e14552b453..266fce02a468 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 78921cc941f9..e8a3cb15337b 100644
+index 9c873a9f4383..97a9005397cf 100644
--- third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
+++ third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -26682,6 +25193,7 @@ index 78921cc941f9..e8a3cb15337b 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -26690,23 +25202,18 @@ index 78921cc941f9..e8a3cb15337b 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -55,114 +68,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -55,93 +64,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -26725,10 +25232,6 @@ index 78921cc941f9..e8a3cb15337b 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -26736,10 +25239,6 @@ index 78921cc941f9..e8a3cb15337b 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -26747,7 +25246,6 @@ index 78921cc941f9..e8a3cb15337b 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -26755,10 +25253,6 @@ index 78921cc941f9..e8a3cb15337b 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -26771,10 +25265,6 @@ index 78921cc941f9..e8a3cb15337b 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -26812,7 +25302,7 @@ index 78921cc941f9..e8a3cb15337b 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -170,82 +76,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -149,82 +72,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -26870,10 +25360,10 @@ index 78921cc941f9..e8a3cb15337b 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -26884,10 +25374,10 @@ index 78921cc941f9..e8a3cb15337b 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -26899,7 +25389,7 @@ index 78921cc941f9..e8a3cb15337b 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 d585bb6edff0..b4a643771882 100644
+index 0fdbdec46999..38a38464659a 100644
--- third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
+++ third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -26910,6 +25400,7 @@ index d585bb6edff0..b4a643771882 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -26918,13 +25409,12 @@ index d585bb6edff0..b4a643771882 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26963,7 +25453,6 @@ index d585bb6edff0..b4a643771882 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -27020,7 +25509,7 @@ index d585bb6edff0..b4a643771882 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -27046,7 +25535,7 @@ index d585bb6edff0..b4a643771882 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -27088,18 +25577,10 @@ index d585bb6edff0..b4a643771882 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 3ed5924b069f..c233d4789a84 100644
+index 7b8696b587d4..10a5020edb33 100644
--- third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
+++ third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -27107,6 +25588,7 @@ index 3ed5924b069f..c233d4789a84 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -27115,23 +25597,18 @@ index 3ed5924b069f..c233d4789a84 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -27150,10 +25627,6 @@ index 3ed5924b069f..c233d4789a84 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -27161,10 +25634,6 @@ index 3ed5924b069f..c233d4789a84 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -27172,7 +25641,6 @@ index 3ed5924b069f..c233d4789a84 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -27180,10 +25648,6 @@ index 3ed5924b069f..c233d4789a84 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -27196,10 +25660,6 @@ index 3ed5924b069f..c233d4789a84 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -27237,7 +25697,7 @@ index 3ed5924b069f..c233d4789a84 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -27295,10 +25755,10 @@ index 3ed5924b069f..c233d4789a84 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -27309,10 +25769,10 @@ index 3ed5924b069f..c233d4789a84 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -27324,18 +25784,10 @@ index 3ed5924b069f..c233d4789a84 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 c58befd49ca2..698f00ffa213 100644
+index cd5491bdefec..25c0b6e740f9 100644
--- third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
+++ third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -27343,6 +25795,7 @@ index c58befd49ca2..698f00ffa213 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -27351,23 +25804,18 @@ index c58befd49ca2..698f00ffa213 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -27386,10 +25834,6 @@ index c58befd49ca2..698f00ffa213 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -27397,10 +25841,6 @@ index c58befd49ca2..698f00ffa213 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -27408,7 +25848,6 @@ index c58befd49ca2..698f00ffa213 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -27416,10 +25855,6 @@ index c58befd49ca2..698f00ffa213 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -27432,10 +25867,6 @@ index c58befd49ca2..698f00ffa213 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -27466,7 +25897,7 @@ index c58befd49ca2..698f00ffa213 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -27553,18 +25984,10 @@ index c58befd49ca2..698f00ffa213 100644
Library("bitrate_configurator_gn")
diff --git third_party/libwebrtc/call/call_gn/moz.build third_party/libwebrtc/call/call_gn/moz.build
-index f9aec69b9481..0b6233af7cf4 100644
+index 4b923766e44a..72c3383fd96e 100644
--- third_party/libwebrtc/call/call_gn/moz.build
+++ third_party/libwebrtc/call/call_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -27572,6 +25995,7 @@ index f9aec69b9481..0b6233af7cf4 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -27580,23 +26004,18 @@ index f9aec69b9481..0b6233af7cf4 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -48,115 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,94 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -27616,10 +26035,6 @@ index f9aec69b9481..0b6233af7cf4 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -27627,10 +26042,6 @@ index f9aec69b9481..0b6233af7cf4 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -27638,7 +26049,6 @@ index f9aec69b9481..0b6233af7cf4 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -27646,10 +26056,6 @@ index f9aec69b9481..0b6233af7cf4 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -27662,10 +26068,6 @@ index f9aec69b9481..0b6233af7cf4 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -27703,7 +26105,7 @@ index f9aec69b9481..0b6233af7cf4 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -164,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -27761,10 +26163,10 @@ index f9aec69b9481..0b6233af7cf4 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -27775,10 +26177,10 @@ index f9aec69b9481..0b6233af7cf4 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -27790,18 +26192,10 @@ index f9aec69b9481..0b6233af7cf4 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 1f23b1b27a12..1ea225bc89ec 100644
+index 2b39c60732c3..e60a38eeef33 100644
--- third_party/libwebrtc/call/call_interfaces_gn/moz.build
+++ third_party/libwebrtc/call/call_interfaces_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -27809,6 +26203,7 @@ index 1f23b1b27a12..1ea225bc89ec 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -27817,23 +26212,18 @@ index 1f23b1b27a12..1ea225bc89ec 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -51,115 +64,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,94 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -27853,10 +26243,6 @@ index 1f23b1b27a12..1ea225bc89ec 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -27864,10 +26250,6 @@ index 1f23b1b27a12..1ea225bc89ec 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -27875,7 +26257,6 @@ index 1f23b1b27a12..1ea225bc89ec 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -27883,10 +26264,6 @@ index 1f23b1b27a12..1ea225bc89ec 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -27899,10 +26276,6 @@ index 1f23b1b27a12..1ea225bc89ec 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -27940,7 +26313,7 @@ index 1f23b1b27a12..1ea225bc89ec 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -167,82 +72,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -146,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -27998,10 +26371,10 @@ index 1f23b1b27a12..1ea225bc89ec 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -28012,10 +26385,10 @@ index 1f23b1b27a12..1ea225bc89ec 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -28027,7 +26400,7 @@ index 1f23b1b27a12..1ea225bc89ec 100644
Library("call_interfaces_gn")
diff --git third_party/libwebrtc/call/payload_type_gn/moz.build third_party/libwebrtc/call/payload_type_gn/moz.build
-index cdfdd3213e1c..f4ab9557672a 100644
+index b92feaad097c..a2eb5b7adca2 100644
--- third_party/libwebrtc/call/payload_type_gn/moz.build
+++ third_party/libwebrtc/call/payload_type_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -28038,6 +26411,7 @@ index cdfdd3213e1c..f4ab9557672a 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -28046,13 +26420,12 @@ index cdfdd3213e1c..f4ab9557672a 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28091,7 +26464,6 @@ index cdfdd3213e1c..f4ab9557672a 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -28148,7 +26520,7 @@ index cdfdd3213e1c..f4ab9557672a 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -28174,7 +26546,7 @@ index cdfdd3213e1c..f4ab9557672a 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -28216,18 +26588,10 @@ index cdfdd3213e1c..f4ab9557672a 100644
-
Library("payload_type_gn")
diff --git third_party/libwebrtc/call/payload_type_picker_gn/moz.build third_party/libwebrtc/call/payload_type_picker_gn/moz.build
-index ec169391df3f..9ba0c035a513 100644
+index 71a4ce74fdb0..1efa64dbafa5 100644
--- third_party/libwebrtc/call/payload_type_picker_gn/moz.build
+++ third_party/libwebrtc/call/payload_type_picker_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -28235,6 +26599,7 @@ index ec169391df3f..9ba0c035a513 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -28243,23 +26608,18 @@ index ec169391df3f..9ba0c035a513 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -28278,10 +26638,6 @@ index ec169391df3f..9ba0c035a513 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -28289,10 +26645,6 @@ index ec169391df3f..9ba0c035a513 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -28300,7 +26652,6 @@ index ec169391df3f..9ba0c035a513 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -28308,10 +26659,6 @@ index ec169391df3f..9ba0c035a513 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -28324,10 +26671,6 @@ index ec169391df3f..9ba0c035a513 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -28365,7 +26708,7 @@ index ec169391df3f..9ba0c035a513 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -28423,10 +26766,10 @@ index ec169391df3f..9ba0c035a513 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -28437,10 +26780,10 @@ index ec169391df3f..9ba0c035a513 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -28452,7 +26795,7 @@ index ec169391df3f..9ba0c035a513 100644
Library("payload_type_picker_gn")
diff --git third_party/libwebrtc/call/receive_stream_interface_gn/moz.build third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
-index 64966940592a..63ee63d8fd44 100644
+index bb48e450e2a4..318dff45f0f9 100644
--- third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
+++ third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -28463,6 +26806,7 @@ index 64966940592a..63ee63d8fd44 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -28471,13 +26815,12 @@ index 64966940592a..63ee63d8fd44 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28516,7 +26859,6 @@ index 64966940592a..63ee63d8fd44 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -28573,7 +26915,7 @@ index 64966940592a..63ee63d8fd44 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -28599,7 +26941,7 @@ index 64966940592a..63ee63d8fd44 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -28641,18 +26983,10 @@ index 64966940592a..63ee63d8fd44 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 a28b8e1a3ffb..bf8bfc4afa1a 100644
+index bfeb90e9822d..d9502b3458ce 100644
--- third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
+++ third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -28660,6 +26994,7 @@ index a28b8e1a3ffb..bf8bfc4afa1a 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -28668,23 +27003,18 @@ index a28b8e1a3ffb..bf8bfc4afa1a 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -28703,10 +27033,6 @@ index a28b8e1a3ffb..bf8bfc4afa1a 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -28714,10 +27040,6 @@ index a28b8e1a3ffb..bf8bfc4afa1a 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -28725,7 +27047,6 @@ index a28b8e1a3ffb..bf8bfc4afa1a 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -28733,10 +27054,6 @@ index a28b8e1a3ffb..bf8bfc4afa1a 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -28749,10 +27066,6 @@ index a28b8e1a3ffb..bf8bfc4afa1a 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -28790,7 +27103,7 @@ index a28b8e1a3ffb..bf8bfc4afa1a 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -28848,10 +27161,10 @@ index a28b8e1a3ffb..bf8bfc4afa1a 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -28862,10 +27175,10 @@ index a28b8e1a3ffb..bf8bfc4afa1a 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -28877,18 +27190,10 @@ index a28b8e1a3ffb..bf8bfc4afa1a 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 2270482f3cec..411cfe288875 100644
+index 53e5ed96c15c..91f237e7a432 100644
--- third_party/libwebrtc/call/rtp_receiver_gn/moz.build
+++ third_party/libwebrtc/call/rtp_receiver_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -28896,6 +27201,7 @@ index 2270482f3cec..411cfe288875 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -28904,23 +27210,18 @@ index 2270482f3cec..411cfe288875 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -48,115 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,94 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -28940,10 +27241,6 @@ index 2270482f3cec..411cfe288875 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -28951,10 +27248,6 @@ index 2270482f3cec..411cfe288875 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -28962,7 +27255,6 @@ index 2270482f3cec..411cfe288875 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -28970,10 +27262,6 @@ index 2270482f3cec..411cfe288875 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -28986,10 +27274,6 @@ index 2270482f3cec..411cfe288875 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -29027,7 +27311,7 @@ index 2270482f3cec..411cfe288875 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -164,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -29085,10 +27369,10 @@ index 2270482f3cec..411cfe288875 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -29099,10 +27383,10 @@ index 2270482f3cec..411cfe288875 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -29114,18 +27398,10 @@ index 2270482f3cec..411cfe288875 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 a700eea303e1..214f2fa96582 100644
+index 3c344e2a71f3..34f4eee93bb4 100644
--- third_party/libwebrtc/call/rtp_sender_gn/moz.build
+++ third_party/libwebrtc/call/rtp_sender_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -29133,6 +27409,7 @@ index a700eea303e1..214f2fa96582 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -29141,23 +27418,18 @@ index a700eea303e1..214f2fa96582 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -48,115 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,94 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -29177,10 +27449,6 @@ index a700eea303e1..214f2fa96582 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -29188,10 +27456,6 @@ index a700eea303e1..214f2fa96582 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -29199,7 +27463,6 @@ index a700eea303e1..214f2fa96582 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -29207,10 +27470,6 @@ index a700eea303e1..214f2fa96582 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -29223,10 +27482,6 @@ index a700eea303e1..214f2fa96582 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -29264,7 +27519,7 @@ index a700eea303e1..214f2fa96582 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -164,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -29322,10 +27577,10 @@ index a700eea303e1..214f2fa96582 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -29336,10 +27591,10 @@ index a700eea303e1..214f2fa96582 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -29351,18 +27606,10 @@ index a700eea303e1..214f2fa96582 100644
Library("rtp_sender_gn")
diff --git third_party/libwebrtc/call/version_gn/moz.build third_party/libwebrtc/call/version_gn/moz.build
-index 6df784f98d03..7ce9a2c33b2a 100644
+index e1d6a6a1229c..6ad8a263227e 100644
--- third_party/libwebrtc/call/version_gn/moz.build
+++ third_party/libwebrtc/call/version_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -29370,6 +27617,7 @@ index 6df784f98d03..7ce9a2c33b2a 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -29378,23 +27626,18 @@ index 6df784f98d03..7ce9a2c33b2a 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,103 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -29409,10 +27652,6 @@ index 6df784f98d03..7ce9a2c33b2a 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -29420,10 +27659,6 @@ index 6df784f98d03..7ce9a2c33b2a 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -29431,7 +27666,6 @@ index 6df784f98d03..7ce9a2c33b2a 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -29439,10 +27673,6 @@ index 6df784f98d03..7ce9a2c33b2a 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -29455,10 +27685,6 @@ index 6df784f98d03..7ce9a2c33b2a 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -29489,7 +27715,7 @@ index 6df784f98d03..7ce9a2c33b2a 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -150,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -29547,10 +27773,10 @@ index 6df784f98d03..7ce9a2c33b2a 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -29561,10 +27787,10 @@ index 6df784f98d03..7ce9a2c33b2a 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -29576,18 +27802,10 @@ index 6df784f98d03..7ce9a2c33b2a 100644
Library("version_gn")
diff --git third_party/libwebrtc/call/video_receive_stream_api_gn/moz.build third_party/libwebrtc/call/video_receive_stream_api_gn/moz.build
-index 3f79e8283204..193d1cf61255 100644
+index 201cca266c32..00e509a7b4aa 100644
--- third_party/libwebrtc/call/video_receive_stream_api_gn/moz.build
+++ third_party/libwebrtc/call/video_receive_stream_api_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -29595,6 +27813,7 @@ index 3f79e8283204..193d1cf61255 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -29603,23 +27822,18 @@ index 3f79e8283204..193d1cf61255 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -29638,10 +27852,6 @@ index 3f79e8283204..193d1cf61255 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -29649,10 +27859,6 @@ index 3f79e8283204..193d1cf61255 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -29660,7 +27866,6 @@ index 3f79e8283204..193d1cf61255 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -29668,10 +27873,6 @@ index 3f79e8283204..193d1cf61255 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -29684,10 +27885,6 @@ index 3f79e8283204..193d1cf61255 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -29725,7 +27922,7 @@ index 3f79e8283204..193d1cf61255 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -29783,10 +27980,10 @@ index 3f79e8283204..193d1cf61255 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -29797,10 +27994,10 @@ index 3f79e8283204..193d1cf61255 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -29812,18 +28009,10 @@ index 3f79e8283204..193d1cf61255 100644
Library("video_receive_stream_api_gn")
diff --git third_party/libwebrtc/call/video_send_stream_api_gn/moz.build third_party/libwebrtc/call/video_send_stream_api_gn/moz.build
-index b2b129fde9a1..3fb37cb3423d 100644
+index 6d75d15802d5..f750e52c2b20 100644
--- third_party/libwebrtc/call/video_send_stream_api_gn/moz.build
+++ third_party/libwebrtc/call/video_send_stream_api_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -29831,6 +28020,7 @@ index b2b129fde9a1..3fb37cb3423d 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -29839,23 +28029,18 @@ index b2b129fde9a1..3fb37cb3423d 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -29874,10 +28059,6 @@ index b2b129fde9a1..3fb37cb3423d 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -29885,10 +28066,6 @@ index b2b129fde9a1..3fb37cb3423d 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -29896,7 +28073,6 @@ index b2b129fde9a1..3fb37cb3423d 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -29904,10 +28080,6 @@ index b2b129fde9a1..3fb37cb3423d 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -29920,10 +28092,6 @@ index b2b129fde9a1..3fb37cb3423d 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -29961,7 +28129,7 @@ index b2b129fde9a1..3fb37cb3423d 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -30019,10 +28187,10 @@ index b2b129fde9a1..3fb37cb3423d 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -30033,10 +28201,10 @@ index b2b129fde9a1..3fb37cb3423d 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -30048,19 +28216,10 @@ index b2b129fde9a1..3fb37cb3423d 100644
Library("video_send_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 5ffb201a4212..99fbd769e4f3 100644
+index 3588afcceba4..efee4c684b12 100644
--- third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
-@@ -11,20 +11,30 @@ AllowCompilerWarnings()
-
- CXXFLAGS += [
- "-mavx2",
-- "-mfma"
-+ "-mfma",
-+ "-std=gnu++20"
- ]
-
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -18,13 +18,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -30069,6 +28228,7 @@ index 5ffb201a4212..99fbd769e4f3 100644
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -30077,23 +28237,18 @@ index 5ffb201a4212..99fbd769e4f3 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -53,143 +63,9 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,122 +62,9 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -30112,10 +28267,6 @@ index 5ffb201a4212..99fbd769e4f3 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -30123,10 +28274,6 @@ index 5ffb201a4212..99fbd769e4f3 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -30134,7 +28281,6 @@ index 5ffb201a4212..99fbd769e4f3 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_GNU_SOURCE"] = True
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
@@ -30143,10 +28289,6 @@ index 5ffb201a4212..99fbd769e4f3 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -30159,10 +28301,6 @@ index 5ffb201a4212..99fbd769e4f3 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -30229,7 +28367,7 @@ index 5ffb201a4212..99fbd769e4f3 100644
CXXFLAGS += [
"-msse2"
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 5d96fe0893a9..0bb8ba5e4738 100644
+index a72dea0e692c..d0d04f598860 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -30240,6 +28378,7 @@ index 5d96fe0893a9..0bb8ba5e4738 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -30248,13 +28387,12 @@ index 5d96fe0893a9..0bb8ba5e4738 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30289,7 +28427,6 @@ index 5d96fe0893a9..0bb8ba5e4738 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -30339,7 +28476,7 @@ index 5d96fe0893a9..0bb8ba5e4738 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,30 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,30 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -30370,7 +28507,7 @@ index 5d96fe0893a9..0bb8ba5e4738 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -159,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -30412,7 +28549,7 @@ index 5d96fe0893a9..0bb8ba5e4738 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 aedc5ef7c816..8381d9637936 100644
+index d75aa3581510..85f93bbcaadf 100644
--- third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -30423,6 +28560,7 @@ index aedc5ef7c816..8381d9637936 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -30431,13 +28569,12 @@ index aedc5ef7c816..8381d9637936 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -83,109 +92,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -83,108 +92,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30486,7 +28623,6 @@ index aedc5ef7c816..8381d9637936 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -30548,7 +28684,7 @@ index aedc5ef7c816..8381d9637936 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -193,20 +100,14 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -192,20 +100,14 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -30573,7 +28709,7 @@ index aedc5ef7c816..8381d9637936 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
"/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c",
-@@ -217,7 +118,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -216,7 +118,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
DEFINES["MIPS32_LE"] = True
DEFINES["MIPS_FPU_LE"] = True
@@ -30581,7 +28717,7 @@ index aedc5ef7c816..8381d9637936 100644
SOURCES += [
"/third_party/libwebrtc/common_audio/signal_processing/resample_by_2_mips.c"
-@@ -234,8 +134,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -233,8 +134,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
if CONFIG["TARGET_CPU"] == "mips64":
@@ -30590,7 +28726,7 @@ index aedc5ef7c816..8381d9637936 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
"/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c",
-@@ -250,78 +148,7 @@ if CONFIG["TARGET_CPU"] == "ppc64":
+@@ -249,78 +148,7 @@ if CONFIG["TARGET_CPU"] == "ppc64":
"/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
]
@@ -30670,7 +28806,7 @@ index aedc5ef7c816..8381d9637936 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
-@@ -329,13 +156,13 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64":
+@@ -328,13 +156,13 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64":
"/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
]
@@ -30686,7 +28822,7 @@ index aedc5ef7c816..8381d9637936 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
-@@ -343,9 +170,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -342,9 +170,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
"/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
]
@@ -30699,18 +28835,10 @@ index aedc5ef7c816..8381d9637936 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
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 0164db65a36b..b19a8495d919 100644
+index 47e1bb77f92a..5b67907b2df6 100644
--- third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -30718,6 +28846,7 @@ index 0164db65a36b..b19a8495d919 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -30726,23 +28855,18 @@ index 0164db65a36b..b19a8495d919 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -30761,10 +28885,6 @@ index 0164db65a36b..b19a8495d919 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -30772,10 +28892,6 @@ index 0164db65a36b..b19a8495d919 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -30783,7 +28899,6 @@ index 0164db65a36b..b19a8495d919 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -30791,10 +28906,6 @@ index 0164db65a36b..b19a8495d919 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -30807,10 +28918,6 @@ index 0164db65a36b..b19a8495d919 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -30841,7 +28948,7 @@ index 0164db65a36b..b19a8495d919 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -30928,18 +29035,10 @@ index 0164db65a36b..b19a8495d919 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 13dbab50bc9a..46d820a5f097 100644
+index 4b2f40786f1b..9649eb186b74 100644
--- third_party/libwebrtc/common_audio/common_audio_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -30947,6 +29046,7 @@ index 13dbab50bc9a..46d820a5f097 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -30955,23 +29055,18 @@ index 13dbab50bc9a..46d820a5f097 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -59,114 +72,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -59,93 +68,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -30990,10 +29085,6 @@ index 13dbab50bc9a..46d820a5f097 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -31001,10 +29092,6 @@ index 13dbab50bc9a..46d820a5f097 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -31012,7 +29099,6 @@ index 13dbab50bc9a..46d820a5f097 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -31020,10 +29106,6 @@ index 13dbab50bc9a..46d820a5f097 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -31036,10 +29118,6 @@ index 13dbab50bc9a..46d820a5f097 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -31077,7 +29155,7 @@ index 13dbab50bc9a..46d820a5f097 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -174,82 +80,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -153,82 +76,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -31135,10 +29213,10 @@ index 13dbab50bc9a..46d820a5f097 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -31149,10 +29227,10 @@ index 13dbab50bc9a..46d820a5f097 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -31164,7 +29242,7 @@ index 13dbab50bc9a..46d820a5f097 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 e259acd562b7..ae82c184e9c5 100644
+index 1c183693402d..52efab61eed2 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
@@ -13,13 +13,24 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -31176,6 +29254,7 @@ index e259acd562b7..ae82c184e9c5 100644
+DEFINES["WEBRTC_ARCH_ARM64"] = True
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
@@ -31185,14 +29264,13 @@ index e259acd562b7..ae82c184e9c5 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__ARM_NEON__"] = "1"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -49,132 +60,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,131 +60,6 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31233,7 +29311,6 @@ index e259acd562b7..ae82c184e9c5 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_GNU_SOURCE"] = True
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
@@ -31326,18 +29403,10 @@ index e259acd562b7..ae82c184e9c5 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 410a9b6c9e1e..fcf864a3511b 100644
+index 9c94e51dfd8f..b3d1eae8da85 100644
--- third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build
-@@ -9,17 +9,32 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,24 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -31346,6 +29415,7 @@ index 410a9b6c9e1e..fcf864a3511b 100644
+DEFINES["WEBRTC_ARCH_ARM64"] = True
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
@@ -31355,24 +29425,19 @@ index 410a9b6c9e1e..fcf864a3511b 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__ARM_NEON__"] = "1"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -48,159 +63,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,138 +59,6 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -31391,10 +29456,6 @@ index 410a9b6c9e1e..fcf864a3511b 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_ARCH_ARM64"] = True
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -31404,10 +29465,6 @@ index 410a9b6c9e1e..fcf864a3511b 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -31415,7 +29472,6 @@ index 410a9b6c9e1e..fcf864a3511b 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_GNU_SOURCE"] = True
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
@@ -31424,10 +29480,6 @@ index 410a9b6c9e1e..fcf864a3511b 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_ARCH_ARM64"] = True
@@ -31442,10 +29494,6 @@ index 410a9b6c9e1e..fcf864a3511b 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -31501,12 +29549,12 @@ index 410a9b6c9e1e..fcf864a3511b 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
- DEFINES["_DEBUG"] = True
-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -31523,18 +29571,10 @@ index 410a9b6c9e1e..fcf864a3511b 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 95fa6e2c26ca..b53526107ee5 100644
+index 8ce96ca06673..6703ddb08c0e 100644
--- third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -31543,6 +29583,7 @@ index 95fa6e2c26ca..b53526107ee5 100644
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -31551,23 +29592,18 @@ index 95fa6e2c26ca..b53526107ee5 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -48,159 +61,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,144 +57,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -31587,8 +29623,7 @@ index 95fa6e2c26ca..b53526107ee5 100644
-if CONFIG["OS_TARGET"] == "Darwin":
-
- CXXFLAGS += [
-- "-msse2",
-- "-std=gnu++20"
+- "-msse2"
- ]
-
- DEFINES["WEBRTC_MAC"] = True
@@ -31598,10 +29633,6 @@ index 95fa6e2c26ca..b53526107ee5 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -31609,7 +29640,6 @@ index 95fa6e2c26ca..b53526107ee5 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_GNU_SOURCE"] = True
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
@@ -31619,8 +29649,7 @@ index 95fa6e2c26ca..b53526107ee5 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- CXXFLAGS += [
-- "-msse2",
-- "-std=gnu++20"
+- "-msse2"
- ]
-
- DEFINES["USE_GLIB"] = "1"
@@ -31635,10 +29664,6 @@ index 95fa6e2c26ca..b53526107ee5 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -31675,8 +29700,8 @@ index 95fa6e2c26ca..b53526107ee5 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
-- DEFINES["_DEBUG"] = True
--
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
@@ -31687,8 +29712,8 @@ index 95fa6e2c26ca..b53526107ee5 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -31720,18 +29745,10 @@ index 95fa6e2c26ca..b53526107ee5 100644
CXXFLAGS += [
"-msse2"
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 722bf527c9ba..b3573a266567 100644
+index accaf02cc53f..9c4b7ce7e534 100644
--- third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
+++ third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -31739,6 +29756,7 @@ index 722bf527c9ba..b3573a266567 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -31747,23 +29765,18 @@ index 722bf527c9ba..b3573a266567 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -31782,10 +29795,6 @@ index 722bf527c9ba..b3573a266567 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -31793,10 +29802,6 @@ index 722bf527c9ba..b3573a266567 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -31804,7 +29809,6 @@ index 722bf527c9ba..b3573a266567 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -31812,10 +29816,6 @@ index 722bf527c9ba..b3573a266567 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -31828,10 +29828,6 @@ index 722bf527c9ba..b3573a266567 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -31869,7 +29865,7 @@ index 722bf527c9ba..b3573a266567 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -31927,10 +29923,10 @@ index 722bf527c9ba..b3573a266567 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -31941,10 +29937,10 @@ index 722bf527c9ba..b3573a266567 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -31956,7 +29952,7 @@ index 722bf527c9ba..b3573a266567 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 577a3319bc5e..97bfb46c2b34 100644
+index 785075282cd4..5e006e643f40 100644
--- third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
+++ third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -31967,6 +29963,7 @@ index 577a3319bc5e..97bfb46c2b34 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -31975,13 +29972,12 @@ index 577a3319bc5e..97bfb46c2b34 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32016,7 +30012,6 @@ index 577a3319bc5e..97bfb46c2b34 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -32066,7 +30061,7 @@ index 577a3319bc5e..97bfb46c2b34 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -32092,7 +30087,7 @@ index 577a3319bc5e..97bfb46c2b34 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -32134,7 +30129,7 @@ index 577a3319bc5e..97bfb46c2b34 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 5169bab0cd78..66ce24f0c8a8 100644
+index 15e2cd1c8e4d..31ec751b206c 100644
--- third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
+++ third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -32145,6 +30140,7 @@ index 5169bab0cd78..66ce24f0c8a8 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -32153,13 +30149,12 @@ index 5169bab0cd78..66ce24f0c8a8 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32198,7 +30193,6 @@ index 5169bab0cd78..66ce24f0c8a8 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -32255,7 +30249,7 @@ index 5169bab0cd78..66ce24f0c8a8 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -32281,7 +30275,7 @@ index 5169bab0cd78..66ce24f0c8a8 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -32323,18 +30317,10 @@ index 5169bab0cd78..66ce24f0c8a8 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 9b470d2c3df3..35ff0b9cb1ca 100644
+index cab1d4bdd6df..aa3b4773526a 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -32342,6 +30328,7 @@ index 9b470d2c3df3..35ff0b9cb1ca 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -32350,23 +30337,18 @@ index 9b470d2c3df3..35ff0b9cb1ca 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -32385,10 +30367,6 @@ index 9b470d2c3df3..35ff0b9cb1ca 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -32396,10 +30374,6 @@ index 9b470d2c3df3..35ff0b9cb1ca 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -32407,7 +30381,6 @@ index 9b470d2c3df3..35ff0b9cb1ca 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -32415,10 +30388,6 @@ index 9b470d2c3df3..35ff0b9cb1ca 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -32431,10 +30400,6 @@ index 9b470d2c3df3..35ff0b9cb1ca 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -32472,7 +30437,7 @@ index 9b470d2c3df3..35ff0b9cb1ca 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -165,122 +71,38 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -144,122 +67,38 @@ if CONFIG["TARGET_CPU"] == "aarch64":
"/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc"
]
@@ -32603,18 +30568,10 @@ index 9b470d2c3df3..35ff0b9cb1ca 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 a97e1340a1c4..2bdbd579a813 100644
+index 913e7fa3a754..4018659e1055 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -32622,6 +30579,7 @@ index a97e1340a1c4..2bdbd579a813 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -32630,23 +30588,18 @@ index a97e1340a1c4..2bdbd579a813 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,103 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -32661,10 +30614,6 @@ index a97e1340a1c4..2bdbd579a813 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -32672,10 +30621,6 @@ index a97e1340a1c4..2bdbd579a813 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -32683,7 +30628,6 @@ index a97e1340a1c4..2bdbd579a813 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -32691,10 +30635,6 @@ index a97e1340a1c4..2bdbd579a813 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -32707,10 +30647,6 @@ index a97e1340a1c4..2bdbd579a813 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -32741,7 +30677,7 @@ index a97e1340a1c4..2bdbd579a813 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -150,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -32799,10 +30735,10 @@ index a97e1340a1c4..2bdbd579a813 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -32813,10 +30749,10 @@ index a97e1340a1c4..2bdbd579a813 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -32828,7 +30764,7 @@ index a97e1340a1c4..2bdbd579a813 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 0d7a0bd85cf2..202e317ddd5c 100644
+index 6045726afc80..969d9eb06c39 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -32839,6 +30775,7 @@ index 0d7a0bd85cf2..202e317ddd5c 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -32847,13 +30784,12 @@ index 0d7a0bd85cf2..202e317ddd5c 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,95 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32892,7 +30828,6 @@ index 0d7a0bd85cf2..202e317ddd5c 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -32950,7 +30885,7 @@ index 0d7a0bd85cf2..202e317ddd5c 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -138,20 +59,12 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,20 +59,12 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -32973,7 +30908,7 @@ index 0d7a0bd85cf2..202e317ddd5c 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
]
-@@ -160,7 +73,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -159,7 +73,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
DEFINES["MIPS32_LE"] = True
DEFINES["MIPS_FPU_LE"] = True
@@ -32981,7 +30916,7 @@ index 0d7a0bd85cf2..202e317ddd5c 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_mips.c"
-@@ -168,8 +80,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -167,8 +80,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
if CONFIG["TARGET_CPU"] == "mips64":
@@ -32990,7 +30925,7 @@ index 0d7a0bd85cf2..202e317ddd5c 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
]
-@@ -180,89 +90,27 @@ if CONFIG["TARGET_CPU"] == "ppc64":
+@@ -179,89 +90,27 @@ if CONFIG["TARGET_CPU"] == "ppc64":
"/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
]
@@ -33086,18 +31021,10 @@ index 0d7a0bd85cf2..202e317ddd5c 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
diff --git third_party/libwebrtc/common_video/common_video_gn/moz.build third_party/libwebrtc/common_video/common_video_gn/moz.build
-index 5d190a1d8e58..8b7c8f83b3e9 100644
+index 29f0179f0773..4ee8b246ab59 100644
--- third_party/libwebrtc/common_video/common_video_gn/moz.build
+++ third_party/libwebrtc/common_video/common_video_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -33105,6 +31032,7 @@ index 5d190a1d8e58..8b7c8f83b3e9 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -33113,23 +31041,18 @@ index 5d190a1d8e58..8b7c8f83b3e9 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -58,114 +71,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -58,93 +67,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -33148,10 +31071,6 @@ index 5d190a1d8e58..8b7c8f83b3e9 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -33159,10 +31078,6 @@ index 5d190a1d8e58..8b7c8f83b3e9 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -33170,7 +31085,6 @@ index 5d190a1d8e58..8b7c8f83b3e9 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -33178,10 +31092,6 @@ index 5d190a1d8e58..8b7c8f83b3e9 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -33194,10 +31104,6 @@ index 5d190a1d8e58..8b7c8f83b3e9 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -33235,236 +31141,7 @@ index 5d190a1d8e58..8b7c8f83b3e9 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -173,82 +79,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
- DEFINES["WEBRTC_HAS_NEON"] = True
- DEFINES["__ARM_NEON__"] = "1"
-
--if CONFIG["TARGET_CPU"] == "arm":
--
-- CXXFLAGS += [
-- "-mfpu=neon"
-- ]
--
-- DEFINES["WEBRTC_ARCH_ARM"] = True
-- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
-- DEFINES["WEBRTC_HAS_NEON"] = True
--
--if CONFIG["TARGET_CPU"] == "loongarch64":
--
-- DEFINES["_GNU_SOURCE"] = True
--
- if CONFIG["TARGET_CPU"] == "mips32":
-
- DEFINES["MIPS32_LE"] = True
- DEFINES["MIPS_FPU_LE"] = True
-- DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["TARGET_CPU"] == "mips64":
--
-- DEFINES["_GNU_SOURCE"] = True
-
- if CONFIG["TARGET_CPU"] == "x86":
-
-- DEFINES["WEBRTC_ENABLE_AVX2"] = True
--
--if CONFIG["TARGET_CPU"] == "x86_64":
--
-- DEFINES["WEBRTC_ENABLE_AVX2"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
--
-- DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
--
-- DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
-- DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
--
-- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
--
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
--
-- DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
--
-- DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
--
- CXXFLAGS += [
- "-msse2"
- ]
-
-- DEFINES["_GNU_SOURCE"] = True
-+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["TARGET_CPU"] == "x86_64":
-
-- DEFINES["_GNU_SOURCE"] = True
-+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
- Library("common_video_gn")
-diff --git third_party/libwebrtc/common_video/corruption_detection_converters_gn/moz.build third_party/libwebrtc/common_video/corruption_detection_converters_gn/moz.build
-index c0ab4b4e89a7..bbcf737b8ba9 100644
---- third_party/libwebrtc/common_video/corruption_detection_converters_gn/moz.build
-+++ third_party/libwebrtc/common_video/corruption_detection_converters_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
- DEFINES["RTC_ENABLE_VP9"] = True
-+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_OZONE"] = "1"
-+DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
-+DEFINES["WEBRTC_POSIX"] = True
- DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
-+DEFINES["_FILE_OFFSET_BITS"] = "64"
-+DEFINES["_LARGEFILE64_SOURCE"] = True
-+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-+DEFINES["__STDC_CONSTANT_MACROS"] = True
-+DEFINES["__STDC_FORMAT_MACROS"] = True
-
- FINAL_LIBRARY = "xul"
-
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
- if CONFIG["MOZ_DEBUG"] == "1":
-
- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
--
--if CONFIG["OS_TARGET"] == "Android":
--
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
-- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
-- DEFINES["HAVE_SYS_UIO_H"] = True
-- DEFINES["WEBRTC_ANDROID"] = True
-- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-- DEFINES["WEBRTC_LINUX"] = True
-- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["_GNU_SOURCE"] = True
-- DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
-- DEFINES["__STDC_CONSTANT_MACROS"] = True
-- DEFINES["__STDC_FORMAT_MACROS"] = True
--
-- OS_LIBS += [
-- "log"
-- ]
--
--if CONFIG["OS_TARGET"] == "Darwin":
--
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
-- DEFINES["WEBRTC_MAC"] = True
-- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["__STDC_CONSTANT_MACROS"] = True
-- DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "Linux":
--
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
-- DEFINES["USE_AURA"] = "1"
-- DEFINES["USE_GLIB"] = "1"
-- DEFINES["USE_OZONE"] = "1"
-- DEFINES["USE_UDEV"] = True
-- DEFINES["WEBRTC_LINUX"] = True
-- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
-- DEFINES["_LARGEFILE64_SOURCE"] = True
-- DEFINES["_LARGEFILE_SOURCE"] = True
-- DEFINES["__STDC_CONSTANT_MACROS"] = True
-- DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "OpenBSD":
--
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
-- DEFINES["USE_GLIB"] = "1"
-- DEFINES["USE_OZONE"] = "1"
-- DEFINES["WEBRTC_BSD"] = True
-- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_LARGEFILE64_SOURCE"] = True
-- DEFINES["_LARGEFILE_SOURCE"] = True
-- DEFINES["__STDC_CONSTANT_MACROS"] = True
-- DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "WINNT":
--
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
-- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
-- DEFINES["NOMINMAX"] = True
-- DEFINES["NTDDI_VERSION"] = "0x0A000000"
-- DEFINES["PSAPI_VERSION"] = "2"
-- DEFINES["RTC_ENABLE_WIN_WGC"] = True
-- DEFINES["UNICODE"] = True
-- DEFINES["USE_AURA"] = "1"
-- DEFINES["WEBRTC_WIN"] = True
-- DEFINES["WIN32"] = True
-- DEFINES["WIN32_LEAN_AND_MEAN"] = True
-- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
-- DEFINES["WINVER"] = "0x0A00"
-- DEFINES["_ATL_NO_OPENGL"] = True
-- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
-- DEFINES["_CRT_RAND_S"] = True
-- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
-- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
-- DEFINES["_HAS_EXCEPTIONS"] = "0"
-- DEFINES["_HAS_NODISCARD"] = True
-- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
-- DEFINES["_SECURE_ATL"] = True
-- DEFINES["_UNICODE"] = True
-- DEFINES["_WIN32_WINNT"] = "0x0A00"
-- DEFINES["_WINDOWS"] = True
-- DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
-- DEFINES["__STD_C"] = True
-+ DEFINES["_DEBUG"] = True
-
- if CONFIG["TARGET_CPU"] == "aarch64":
-
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -152,82 +75,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -33549,9 +31226,9 @@ index c0ab4b4e89a7..bbcf737b8ba9 100644
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- Library("corruption_detection_converters_gn")
+ Library("common_video_gn")
diff --git third_party/libwebrtc/common_video/corruption_score_calculator_gn/moz.build third_party/libwebrtc/common_video/corruption_score_calculator_gn/moz.build
-index 8a58185d4906..cd4f1b658226 100644
+index d6dca2520c59..530a94e8643b 100644
--- third_party/libwebrtc/common_video/corruption_score_calculator_gn/moz.build
+++ third_party/libwebrtc/common_video/corruption_score_calculator_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -33562,6 +31239,7 @@ index 8a58185d4906..cd4f1b658226 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -33570,13 +31248,12 @@ index 8a58185d4906..cd4f1b658226 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33615,7 +31292,6 @@ index 8a58185d4906..cd4f1b658226 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -33672,7 +31348,7 @@ index 8a58185d4906..cd4f1b658226 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -33698,7 +31374,7 @@ index 8a58185d4906..cd4f1b658226 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -33740,7 +31416,7 @@ index 8a58185d4906..cd4f1b658226 100644
-
Library("corruption_score_calculator_gn")
diff --git third_party/libwebrtc/common_video/frame_counts_gn/moz.build third_party/libwebrtc/common_video/frame_counts_gn/moz.build
-index ae398195f804..5606ed4ca120 100644
+index 4d4150d00c2a..7242f0d8a3ae 100644
--- third_party/libwebrtc/common_video/frame_counts_gn/moz.build
+++ third_party/libwebrtc/common_video/frame_counts_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -33751,6 +31427,7 @@ index ae398195f804..5606ed4ca120 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -33759,13 +31436,12 @@ index ae398195f804..5606ed4ca120 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33800,7 +31476,6 @@ index ae398195f804..5606ed4ca120 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -33850,7 +31525,7 @@ index ae398195f804..5606ed4ca120 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -33876,7 +31551,7 @@ index ae398195f804..5606ed4ca120 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -33917,197 +31592,11 @@ index ae398195f804..5606ed4ca120 100644
- DEFINES["_GNU_SOURCE"] = True
-
Library("frame_counts_gn")
-diff --git third_party/libwebrtc/common_video/frame_instrumentation_data_gn/moz.build third_party/libwebrtc/common_video/frame_instrumentation_data_gn/moz.build
-index 5f35af97085c..ab2507d63de5 100644
---- third_party/libwebrtc/common_video/frame_instrumentation_data_gn/moz.build
-+++ third_party/libwebrtc/common_video/frame_instrumentation_data_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
- DEFINES["RTC_ENABLE_VP9"] = True
-+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_OZONE"] = "1"
-+DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
-+DEFINES["WEBRTC_POSIX"] = True
- DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
-+DEFINES["_FILE_OFFSET_BITS"] = "64"
-+DEFINES["_LARGEFILE64_SOURCE"] = True
-+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-+DEFINES["__STDC_CONSTANT_MACROS"] = True
-+DEFINES["__STDC_FORMAT_MACROS"] = True
-
- FINAL_LIBRARY = "xul"
-
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
- if CONFIG["MOZ_DEBUG"] == "1":
-
- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
--
--if CONFIG["OS_TARGET"] == "Android":
--
-- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
-- DEFINES["HAVE_SYS_UIO_H"] = True
-- DEFINES["WEBRTC_ANDROID"] = True
-- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-- DEFINES["WEBRTC_LINUX"] = True
-- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["_GNU_SOURCE"] = True
-- DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
-- DEFINES["__STDC_CONSTANT_MACROS"] = True
-- DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "Darwin":
--
-- DEFINES["WEBRTC_MAC"] = True
-- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["__STDC_CONSTANT_MACROS"] = True
-- DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["USE_AURA"] = "1"
-- DEFINES["USE_GLIB"] = "1"
-- DEFINES["USE_OZONE"] = "1"
-- DEFINES["USE_UDEV"] = True
-- DEFINES["WEBRTC_LINUX"] = True
-- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
-- DEFINES["_LARGEFILE64_SOURCE"] = True
-- DEFINES["_LARGEFILE_SOURCE"] = True
-- DEFINES["__STDC_CONSTANT_MACROS"] = True
-- DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "OpenBSD":
--
-- DEFINES["USE_GLIB"] = "1"
-- DEFINES["USE_OZONE"] = "1"
-- DEFINES["WEBRTC_BSD"] = True
-- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_LARGEFILE64_SOURCE"] = True
-- DEFINES["_LARGEFILE_SOURCE"] = True
-- DEFINES["__STDC_CONSTANT_MACROS"] = True
-- DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "WINNT":
--
-- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
-- DEFINES["NOMINMAX"] = True
-- DEFINES["NTDDI_VERSION"] = "0x0A000000"
-- DEFINES["PSAPI_VERSION"] = "2"
-- DEFINES["RTC_ENABLE_WIN_WGC"] = True
-- DEFINES["UNICODE"] = True
-- DEFINES["USE_AURA"] = "1"
-- DEFINES["WEBRTC_WIN"] = True
-- DEFINES["WIN32"] = True
-- DEFINES["WIN32_LEAN_AND_MEAN"] = True
-- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
-- DEFINES["WINVER"] = "0x0A00"
-- DEFINES["_ATL_NO_OPENGL"] = True
-- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
-- DEFINES["_CRT_RAND_S"] = True
-- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
-- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
-- DEFINES["_HAS_EXCEPTIONS"] = "0"
-- DEFINES["_HAS_NODISCARD"] = True
-- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
-- DEFINES["_SECURE_ATL"] = True
-- DEFINES["_UNICODE"] = True
-- DEFINES["_WIN32_WINNT"] = "0x0A00"
-- DEFINES["_WINDOWS"] = True
-- DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
-- DEFINES["__STD_C"] = True
-+ DEFINES["_DEBUG"] = True
-
- if CONFIG["TARGET_CPU"] == "aarch64":
-
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
- DEFINES["WEBRTC_HAS_NEON"] = True
- DEFINES["__ARM_NEON__"] = "1"
-
--if CONFIG["TARGET_CPU"] == "arm":
--
-- DEFINES["WEBRTC_ARCH_ARM"] = True
-- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
-- DEFINES["WEBRTC_HAS_NEON"] = True
--
--if CONFIG["TARGET_CPU"] == "loongarch64":
--
-- DEFINES["_GNU_SOURCE"] = True
--
- if CONFIG["TARGET_CPU"] == "mips32":
-
- DEFINES["MIPS32_LE"] = True
- DEFINES["MIPS_FPU_LE"] = True
-- DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["TARGET_CPU"] == "mips64":
--
-- DEFINES["_GNU_SOURCE"] = True
-
- if CONFIG["TARGET_CPU"] == "x86":
-
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
-
- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
--
-- DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
--
-- DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
-- DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
--
-- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
--
-- DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
--
-- DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
--
-- DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
--
-- DEFINES["_GNU_SOURCE"] = True
--
- Library("frame_instrumentation_data_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 622a838eca2a..ad084e2194ad 100644
+index 8a8df2cad0f0..940b58e66a82 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -34115,6 +31604,7 @@ index 622a838eca2a..ad084e2194ad 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -34123,23 +31613,18 @@ index 622a838eca2a..ad084e2194ad 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -34158,10 +31643,6 @@ index 622a838eca2a..ad084e2194ad 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -34169,10 +31650,6 @@ index 622a838eca2a..ad084e2194ad 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -34180,7 +31657,6 @@ index 622a838eca2a..ad084e2194ad 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -34188,10 +31664,6 @@ index 622a838eca2a..ad084e2194ad 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -34204,10 +31676,6 @@ index 622a838eca2a..ad084e2194ad 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -34238,7 +31706,7 @@ index 622a838eca2a..ad084e2194ad 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -34325,7 +31793,7 @@ index 622a838eca2a..ad084e2194ad 100644
Library("generic_frame_descriptor_gn")
diff --git third_party/libwebrtc/dcsctp_gn/moz.build third_party/libwebrtc/dcsctp_gn/moz.build
-index 44f583c80d8a..f4469da2599d 100644
+index e36ba8e99307..d5c1d389564b 100644
--- third_party/libwebrtc/dcsctp_gn/moz.build
+++ third_party/libwebrtc/dcsctp_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -34336,6 +31804,7 @@ index 44f583c80d8a..f4469da2599d 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -34344,13 +31813,12 @@ index 44f583c80d8a..f4469da2599d 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34389,7 +31857,6 @@ index 44f583c80d8a..f4469da2599d 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -34446,7 +31913,7 @@ index 44f583c80d8a..f4469da2599d 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -34472,7 +31939,7 @@ index 44f583c80d8a..f4469da2599d 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -34514,7 +31981,7 @@ index 44f583c80d8a..f4469da2599d 100644
-
Library("dcsctp_gn")
diff --git third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build
-index 352ec8e82f14..0ae34bbf3159 100644
+index c01a31a5b7da..164662ca337c 100644
--- third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build
+++ third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -34525,6 +31992,7 @@ index 352ec8e82f14..0ae34bbf3159 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -34533,13 +32001,12 @@ index 352ec8e82f14..0ae34bbf3159 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34574,7 +32041,6 @@ index 352ec8e82f14..0ae34bbf3159 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -34624,7 +32090,7 @@ index 352ec8e82f14..0ae34bbf3159 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -34650,7 +32116,7 @@ index 352ec8e82f14..0ae34bbf3159 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -34706,18 +32172,10 @@ index edb8e084a33a..e2236e78c4a0 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 92e42333271c..fc88fc12b670 100644
+index 158436eafa45..251655a1a226 100644
--- third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -34725,6 +32183,7 @@ index 92e42333271c..fc88fc12b670 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -34733,23 +32192,18 @@ index 92e42333271c..fc88fc12b670 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -50,114 +63,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,93 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -34768,10 +32222,6 @@ index 92e42333271c..fc88fc12b670 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -34779,10 +32229,6 @@ index 92e42333271c..fc88fc12b670 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -34790,7 +32236,6 @@ index 92e42333271c..fc88fc12b670 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -34798,10 +32243,6 @@ index 92e42333271c..fc88fc12b670 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -34814,10 +32255,6 @@ index 92e42333271c..fc88fc12b670 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -34855,7 +32292,7 @@ index 92e42333271c..fc88fc12b670 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -165,82 +71,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -144,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -34913,10 +32350,10 @@ index 92e42333271c..fc88fc12b670 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -34927,10 +32364,10 @@ index 92e42333271c..fc88fc12b670 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -34942,18 +32379,10 @@ index 92e42333271c..fc88fc12b670 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 cf656cb19359..d1d7b99a002a 100644
+index 1ac713b1e2a5..552eb9cf4167 100644
--- third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -34961,6 +32390,7 @@ index cf656cb19359..d1d7b99a002a 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -34969,23 +32399,18 @@ index cf656cb19359..d1d7b99a002a 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -51,114 +64,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,93 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -35004,10 +32429,6 @@ index cf656cb19359..d1d7b99a002a 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -35015,10 +32436,6 @@ index cf656cb19359..d1d7b99a002a 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -35026,7 +32443,6 @@ index cf656cb19359..d1d7b99a002a 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -35034,10 +32450,6 @@ index cf656cb19359..d1d7b99a002a 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -35050,10 +32462,6 @@ index cf656cb19359..d1d7b99a002a 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -35091,7 +32499,7 @@ index cf656cb19359..d1d7b99a002a 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -166,82 +72,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -145,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -35149,10 +32557,10 @@ index cf656cb19359..d1d7b99a002a 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -35163,10 +32571,10 @@ index cf656cb19359..d1d7b99a002a 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -35178,18 +32586,10 @@ index cf656cb19359..d1d7b99a002a 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 b01bd2a19d2a..ff4a8f56a922 100644
+index c1305a84a6cc..3087fdcc327a 100644
--- third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -35197,6 +32597,7 @@ index b01bd2a19d2a..ff4a8f56a922 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -35205,23 +32606,18 @@ index b01bd2a19d2a..ff4a8f56a922 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -49,114 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -35240,10 +32636,6 @@ index b01bd2a19d2a..ff4a8f56a922 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -35251,10 +32643,6 @@ index b01bd2a19d2a..ff4a8f56a922 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -35262,7 +32650,6 @@ index b01bd2a19d2a..ff4a8f56a922 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -35270,10 +32657,6 @@ index b01bd2a19d2a..ff4a8f56a922 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -35286,10 +32669,6 @@ index b01bd2a19d2a..ff4a8f56a922 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -35327,7 +32706,7 @@ index b01bd2a19d2a..ff4a8f56a922 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -164,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -35385,10 +32764,10 @@ index b01bd2a19d2a..ff4a8f56a922 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -35399,10 +32778,10 @@ index b01bd2a19d2a..ff4a8f56a922 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -35414,7 +32793,7 @@ index b01bd2a19d2a..ff4a8f56a922 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 42336df5fa6b..2f1eb4312e6a 100644
+index 81e5642488fb..27983ddaa07f 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -35425,6 +32804,7 @@ index 42336df5fa6b..2f1eb4312e6a 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -35433,13 +32813,12 @@ index 42336df5fa6b..2f1eb4312e6a 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35478,7 +32857,6 @@ index 42336df5fa6b..2f1eb4312e6a 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -35528,7 +32906,7 @@ index 42336df5fa6b..2f1eb4312e6a 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -35554,7 +32932,7 @@ index 42336df5fa6b..2f1eb4312e6a 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -35596,18 +32974,10 @@ index 42336df5fa6b..2f1eb4312e6a 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 48f605b67536..28e02820b18e 100644
+index 68c681097dd3..f050b1ed6acd 100644
--- third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -35615,6 +32985,7 @@ index 48f605b67536..28e02820b18e 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -35623,23 +32994,18 @@ index 48f605b67536..28e02820b18e 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -48,107 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,86 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -35658,10 +33024,6 @@ index 48f605b67536..28e02820b18e 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -35669,10 +33031,6 @@ index 48f605b67536..28e02820b18e 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -35680,7 +33038,6 @@ index 48f605b67536..28e02820b18e 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -35688,10 +33045,6 @@ index 48f605b67536..28e02820b18e 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -35704,10 +33057,6 @@ index 48f605b67536..28e02820b18e 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -35738,7 +33087,7 @@ index 48f605b67536..28e02820b18e 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -156,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -135,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -35825,18 +33174,10 @@ index 48f605b67536..28e02820b18e 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 769426790d5e..2c19edcb9ef3 100644
+index 8e54172d3ffc..15705b114eb9 100644
--- third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -35844,6 +33185,7 @@ index 769426790d5e..2c19edcb9ef3 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -35852,23 +33194,18 @@ index 769426790d5e..2c19edcb9ef3 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -35887,10 +33224,6 @@ index 769426790d5e..2c19edcb9ef3 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -35898,10 +33231,6 @@ index 769426790d5e..2c19edcb9ef3 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -35909,7 +33238,6 @@ index 769426790d5e..2c19edcb9ef3 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -35917,10 +33245,6 @@ index 769426790d5e..2c19edcb9ef3 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -35933,10 +33257,6 @@ index 769426790d5e..2c19edcb9ef3 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -35974,7 +33294,7 @@ index 769426790d5e..2c19edcb9ef3 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -36032,10 +33352,10 @@ index 769426790d5e..2c19edcb9ef3 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -36046,10 +33366,10 @@ index 769426790d5e..2c19edcb9ef3 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -36061,18 +33381,10 @@ index 769426790d5e..2c19edcb9ef3 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 3667d09360a2..2a003ff5236b 100644
+index 3e27015753fd..7a52b559595d 100644
--- third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -36080,6 +33392,7 @@ index 3667d09360a2..2a003ff5236b 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -36088,23 +33401,18 @@ index 3667d09360a2..2a003ff5236b 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -49,114 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -36123,10 +33431,6 @@ index 3667d09360a2..2a003ff5236b 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -36134,10 +33438,6 @@ index 3667d09360a2..2a003ff5236b 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -36145,7 +33445,6 @@ index 3667d09360a2..2a003ff5236b 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -36153,10 +33452,6 @@ index 3667d09360a2..2a003ff5236b 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -36169,10 +33464,6 @@ index 3667d09360a2..2a003ff5236b 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -36210,7 +33501,7 @@ index 3667d09360a2..2a003ff5236b 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -164,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -36268,10 +33559,10 @@ index 3667d09360a2..2a003ff5236b 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -36282,10 +33573,10 @@ index 3667d09360a2..2a003ff5236b 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -36297,18 +33588,10 @@ index 3667d09360a2..2a003ff5236b 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 ba5e515cd8e4..0648ec187f14 100644
+index 79fa2f18c369..42638e9c1a58 100644
--- third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -36316,6 +33599,7 @@ index ba5e515cd8e4..0648ec187f14 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -36324,23 +33608,18 @@ index ba5e515cd8e4..0648ec187f14 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -36359,10 +33638,6 @@ index ba5e515cd8e4..0648ec187f14 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -36370,10 +33645,6 @@ index ba5e515cd8e4..0648ec187f14 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -36381,7 +33652,6 @@ index ba5e515cd8e4..0648ec187f14 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -36389,10 +33659,6 @@ index ba5e515cd8e4..0648ec187f14 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -36405,10 +33671,6 @@ index ba5e515cd8e4..0648ec187f14 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -36446,7 +33708,7 @@ index ba5e515cd8e4..0648ec187f14 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -36504,10 +33766,10 @@ index ba5e515cd8e4..0648ec187f14 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -36518,10 +33780,10 @@ index ba5e515cd8e4..0648ec187f14 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -36533,18 +33795,10 @@ index ba5e515cd8e4..0648ec187f14 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 916957e22c81..10f7b60985b4 100644
+index 4567caafbe26..2017f2c23000 100644
--- third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -36552,6 +33806,7 @@ index 916957e22c81..10f7b60985b4 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -36560,23 +33815,18 @@ index 916957e22c81..10f7b60985b4 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -36595,10 +33845,6 @@ index 916957e22c81..10f7b60985b4 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -36606,10 +33852,6 @@ index 916957e22c81..10f7b60985b4 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -36617,7 +33859,6 @@ index 916957e22c81..10f7b60985b4 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -36625,10 +33866,6 @@ index 916957e22c81..10f7b60985b4 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -36641,10 +33878,6 @@ index 916957e22c81..10f7b60985b4 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -36682,7 +33915,7 @@ index 916957e22c81..10f7b60985b4 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -36740,10 +33973,10 @@ index 916957e22c81..10f7b60985b4 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -36754,10 +33987,10 @@ index 916957e22c81..10f7b60985b4 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -36769,18 +34002,10 @@ index 916957e22c81..10f7b60985b4 100644
Library("rtc_stream_config_gn")
diff --git third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build
-index 695b2ba30bd3..7ebde21eaa29 100644
+index 170ceb38ea18..ff3ef7c10365 100644
--- third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build
+++ third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -36788,6 +34013,7 @@ index 695b2ba30bd3..7ebde21eaa29 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -36796,23 +34022,18 @@ index 695b2ba30bd3..7ebde21eaa29 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -36831,10 +34052,6 @@ index 695b2ba30bd3..7ebde21eaa29 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -36842,10 +34059,6 @@ index 695b2ba30bd3..7ebde21eaa29 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -36853,7 +34066,6 @@ index 695b2ba30bd3..7ebde21eaa29 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -36861,10 +34073,6 @@ index 695b2ba30bd3..7ebde21eaa29 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -36877,10 +34085,6 @@ index 695b2ba30bd3..7ebde21eaa29 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -36918,7 +34122,7 @@ index 695b2ba30bd3..7ebde21eaa29 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -36976,10 +34180,10 @@ index 695b2ba30bd3..7ebde21eaa29 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -36990,10 +34194,10 @@ index 695b2ba30bd3..7ebde21eaa29 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -37005,7 +34209,7 @@ index 695b2ba30bd3..7ebde21eaa29 100644
Library("adapted_video_track_source_gn")
diff --git third_party/libwebrtc/media/audio_source_gn/moz.build third_party/libwebrtc/media/audio_source_gn/moz.build
-index 3581e20cca1b..9b54caddd0de 100644
+index f1168831de90..5fd47ccaeddd 100644
--- third_party/libwebrtc/media/audio_source_gn/moz.build
+++ third_party/libwebrtc/media/audio_source_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -37016,6 +34220,7 @@ index 3581e20cca1b..9b54caddd0de 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -37024,13 +34229,12 @@ index 3581e20cca1b..9b54caddd0de 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37065,7 +34269,6 @@ index 3581e20cca1b..9b54caddd0de 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -37115,7 +34318,7 @@ index 3581e20cca1b..9b54caddd0de 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -37141,7 +34344,7 @@ index 3581e20cca1b..9b54caddd0de 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -37183,18 +34386,10 @@ index 3581e20cca1b..9b54caddd0de 100644
-
Library("audio_source_gn")
diff --git third_party/libwebrtc/media/codec_gn/moz.build third_party/libwebrtc/media/codec_gn/moz.build
-index 1a17cd2f4d2d..2e47ae5fdda4 100644
+index 4dbfaebba1b4..ac11b1371193 100644
--- third_party/libwebrtc/media/codec_gn/moz.build
+++ third_party/libwebrtc/media/codec_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -37202,6 +34397,7 @@ index 1a17cd2f4d2d..2e47ae5fdda4 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -37210,23 +34406,18 @@ index 1a17cd2f4d2d..2e47ae5fdda4 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -37245,10 +34436,6 @@ index 1a17cd2f4d2d..2e47ae5fdda4 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -37256,10 +34443,6 @@ index 1a17cd2f4d2d..2e47ae5fdda4 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -37267,7 +34450,6 @@ index 1a17cd2f4d2d..2e47ae5fdda4 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -37275,10 +34457,6 @@ index 1a17cd2f4d2d..2e47ae5fdda4 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -37291,10 +34469,6 @@ index 1a17cd2f4d2d..2e47ae5fdda4 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -37332,7 +34506,7 @@ index 1a17cd2f4d2d..2e47ae5fdda4 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -37390,10 +34564,10 @@ index 1a17cd2f4d2d..2e47ae5fdda4 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -37404,10 +34578,10 @@ index 1a17cd2f4d2d..2e47ae5fdda4 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -37419,7 +34593,7 @@ index 1a17cd2f4d2d..2e47ae5fdda4 100644
Library("codec_gn")
diff --git third_party/libwebrtc/media/media_channel_gn/moz.build third_party/libwebrtc/media/media_channel_gn/moz.build
-index b49bb251e1b9..e01e3b526b85 100644
+index 0848daf93ca9..6dab893e0066 100644
--- third_party/libwebrtc/media/media_channel_gn/moz.build
+++ third_party/libwebrtc/media/media_channel_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -37430,6 +34604,7 @@ index b49bb251e1b9..e01e3b526b85 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -37438,13 +34613,12 @@ index b49bb251e1b9..e01e3b526b85 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,95 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37484,7 +34658,6 @@ index b49bb251e1b9..e01e3b526b85 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -37541,7 +34714,7 @@ index b49bb251e1b9..e01e3b526b85 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -37567,7 +34740,7 @@ index b49bb251e1b9..e01e3b526b85 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -166,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -37609,7 +34782,7 @@ index b49bb251e1b9..e01e3b526b85 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 37f5a67f2bcc..6533a1bbd386 100644
+index e758c604f5f3..a59748d1b38c 100644
--- third_party/libwebrtc/media/media_channel_impl_gn/moz.build
+++ third_party/libwebrtc/media/media_channel_impl_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -37620,6 +34793,7 @@ index 37f5a67f2bcc..6533a1bbd386 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -37628,13 +34802,12 @@ index 37f5a67f2bcc..6533a1bbd386 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37669,7 +34842,6 @@ index 37f5a67f2bcc..6533a1bbd386 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -37719,7 +34891,7 @@ index 37f5a67f2bcc..6533a1bbd386 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -37745,7 +34917,7 @@ index 37f5a67f2bcc..6533a1bbd386 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -37787,18 +34959,10 @@ index 37f5a67f2bcc..6533a1bbd386 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 a104d2262dee..20928cdabcd3 100644
+index 95445fbdf6e8..68728dd78931 100644
--- third_party/libwebrtc/media/media_constants_gn/moz.build
+++ third_party/libwebrtc/media/media_constants_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -37806,6 +34970,7 @@ index a104d2262dee..20928cdabcd3 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -37814,23 +34979,18 @@ index a104d2262dee..20928cdabcd3 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,103 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -37845,10 +35005,6 @@ index a104d2262dee..20928cdabcd3 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -37856,10 +35012,6 @@ index a104d2262dee..20928cdabcd3 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -37867,7 +35019,6 @@ index a104d2262dee..20928cdabcd3 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -37875,10 +35026,6 @@ index a104d2262dee..20928cdabcd3 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -37891,10 +35038,6 @@ index a104d2262dee..20928cdabcd3 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -37925,7 +35068,7 @@ index a104d2262dee..20928cdabcd3 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -150,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -37983,10 +35126,10 @@ index a104d2262dee..20928cdabcd3 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -37997,10 +35140,10 @@ index a104d2262dee..20928cdabcd3 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -38012,7 +35155,7 @@ index a104d2262dee..20928cdabcd3 100644
Library("media_constants_gn")
diff --git third_party/libwebrtc/media/media_engine_gn/moz.build third_party/libwebrtc/media/media_engine_gn/moz.build
-index fdf4a8ebf6e8..de1d36c1c373 100644
+index cf139814ceb9..eaff43e12948 100644
--- third_party/libwebrtc/media/media_engine_gn/moz.build
+++ third_party/libwebrtc/media/media_engine_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -38023,6 +35166,7 @@ index fdf4a8ebf6e8..de1d36c1c373 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -38031,13 +35175,12 @@ index fdf4a8ebf6e8..de1d36c1c373 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,95 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38077,7 +35220,6 @@ index fdf4a8ebf6e8..de1d36c1c373 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -38134,7 +35276,7 @@ index fdf4a8ebf6e8..de1d36c1c373 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -38160,7 +35302,7 @@ index fdf4a8ebf6e8..de1d36c1c373 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -166,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -38202,18 +35344,10 @@ index fdf4a8ebf6e8..de1d36c1c373 100644
-
Library("media_engine_gn")
diff --git third_party/libwebrtc/media/rid_description_gn/moz.build third_party/libwebrtc/media/rid_description_gn/moz.build
-index 50a2fd68b45b..1e41f0c073af 100644
+index 0989e698875d..2e232c6ada46 100644
--- third_party/libwebrtc/media/rid_description_gn/moz.build
+++ third_party/libwebrtc/media/rid_description_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -38221,6 +35355,7 @@ index 50a2fd68b45b..1e41f0c073af 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -38229,23 +35364,18 @@ index 50a2fd68b45b..1e41f0c073af 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -38264,10 +35394,6 @@ index 50a2fd68b45b..1e41f0c073af 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -38275,10 +35401,6 @@ index 50a2fd68b45b..1e41f0c073af 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -38286,7 +35408,6 @@ index 50a2fd68b45b..1e41f0c073af 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -38294,10 +35415,6 @@ index 50a2fd68b45b..1e41f0c073af 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -38310,10 +35427,6 @@ index 50a2fd68b45b..1e41f0c073af 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -38351,7 +35464,7 @@ index 50a2fd68b45b..1e41f0c073af 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -38409,10 +35522,10 @@ index 50a2fd68b45b..1e41f0c073af 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -38423,10 +35536,10 @@ index 50a2fd68b45b..1e41f0c073af 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -38438,19 +35551,10 @@ index 50a2fd68b45b..1e41f0c073af 100644
Library("rid_description_gn")
diff --git third_party/libwebrtc/media/rtc_audio_video_gn/moz.build third_party/libwebrtc/media/rtc_audio_video_gn/moz.build
-index e13e7218f6af..9c05bb7e2414 100644
+index 72d03172392a..235284ab4f03 100644
--- third_party/libwebrtc/media/rtc_audio_video_gn/moz.build
+++ third_party/libwebrtc/media/rtc_audio_video_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["HAVE_WEBRTC_VIDEO"] = True
+@@ -14,12 +14,21 @@ DEFINES["HAVE_WEBRTC_VIDEO"] = True
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -38458,6 +35562,7 @@ index e13e7218f6af..9c05bb7e2414 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -38466,23 +35571,18 @@ index e13e7218f6af..9c05bb7e2414 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -48,119 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,98 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -38502,10 +35602,6 @@ index e13e7218f6af..9c05bb7e2414 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -38513,10 +35609,6 @@ index e13e7218f6af..9c05bb7e2414 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -38524,7 +35616,6 @@ index e13e7218f6af..9c05bb7e2414 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -38532,10 +35623,6 @@ index e13e7218f6af..9c05bb7e2414 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -38548,10 +35635,6 @@ index e13e7218f6af..9c05bb7e2414 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -38593,7 +35676,7 @@ index e13e7218f6af..9c05bb7e2414 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -168,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -147,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -38651,10 +35734,10 @@ index e13e7218f6af..9c05bb7e2414 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -38665,10 +35748,10 @@ index e13e7218f6af..9c05bb7e2414 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -38680,19 +35763,10 @@ index e13e7218f6af..9c05bb7e2414 100644
Library("rtc_audio_video_gn")
diff --git third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
-index 29d2e027afa8..6daa5629a1eb 100644
+index f72d9c49f1de..7254f017e2f2 100644
--- third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
+++ third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
+@@ -14,12 +14,21 @@ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
DEFINES["RTC_USE_LIBAOM_AV1_ENCODER"] = True
@@ -38700,6 +35774,7 @@ index 29d2e027afa8..6daa5629a1eb 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -38708,23 +35783,18 @@ index 29d2e027afa8..6daa5629a1eb 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,115 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -38744,10 +35814,6 @@ index 29d2e027afa8..6daa5629a1eb 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -38755,10 +35821,6 @@ index 29d2e027afa8..6daa5629a1eb 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -38766,7 +35828,6 @@ index 29d2e027afa8..6daa5629a1eb 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -38774,10 +35835,6 @@ index 29d2e027afa8..6daa5629a1eb 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -38790,10 +35847,6 @@ index 29d2e027afa8..6daa5629a1eb 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -38831,7 +35884,7 @@ index 29d2e027afa8..6daa5629a1eb 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -163,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -38889,10 +35942,10 @@ index 29d2e027afa8..6daa5629a1eb 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -38903,10 +35956,10 @@ index 29d2e027afa8..6daa5629a1eb 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -38918,7 +35971,7 @@ index 29d2e027afa8..6daa5629a1eb 100644
Library("rtc_internal_video_codecs_gn")
diff --git third_party/libwebrtc/media/rtc_media_base_gn/moz.build third_party/libwebrtc/media/rtc_media_base_gn/moz.build
-index 492ef557c6d5..2d9dd74dd71d 100644
+index f465cb96722d..7110338b2381 100644
--- third_party/libwebrtc/media/rtc_media_base_gn/moz.build
+++ third_party/libwebrtc/media/rtc_media_base_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -38929,6 +35982,7 @@ index 492ef557c6d5..2d9dd74dd71d 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -38937,13 +35991,12 @@ index 492ef557c6d5..2d9dd74dd71d 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,95 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38983,7 +36036,6 @@ index 492ef557c6d5..2d9dd74dd71d 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -39040,7 +36092,7 @@ index 492ef557c6d5..2d9dd74dd71d 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -39066,7 +36118,7 @@ index 492ef557c6d5..2d9dd74dd71d 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -166,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -39108,7 +36160,7 @@ index 492ef557c6d5..2d9dd74dd71d 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 c42978367e79..ae42a4df5b02 100644
+index ea8062a2e446..7b25a9566dbe 100644
--- third_party/libwebrtc/media/rtc_media_config_gn/moz.build
+++ third_party/libwebrtc/media/rtc_media_config_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -39119,6 +36171,7 @@ index c42978367e79..ae42a4df5b02 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -39127,13 +36180,12 @@ index c42978367e79..ae42a4df5b02 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39168,7 +36220,6 @@ index c42978367e79..ae42a4df5b02 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -39218,7 +36269,7 @@ index c42978367e79..ae42a4df5b02 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -39244,7 +36295,7 @@ index c42978367e79..ae42a4df5b02 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -39286,7 +36337,7 @@ index c42978367e79..ae42a4df5b02 100644
-
Library("rtc_media_config_gn")
diff --git third_party/libwebrtc/media/rtc_media_gn/moz.build third_party/libwebrtc/media/rtc_media_gn/moz.build
-index ab0badb3130e..fe7e6cd83f1f 100644
+index 0feaa31871e0..d506d7e4b811 100644
--- third_party/libwebrtc/media/rtc_media_gn/moz.build
+++ third_party/libwebrtc/media/rtc_media_gn/moz.build
@@ -14,12 +14,21 @@ DEFINES["HAVE_WEBRTC_VIDEO"] = True
@@ -39297,6 +36348,7 @@ index ab0badb3130e..fe7e6cd83f1f 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -39305,13 +36357,12 @@ index ab0badb3130e..fe7e6cd83f1f 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -43,99 +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"
@@ -39351,7 +36402,6 @@ index ab0badb3130e..fe7e6cd83f1f 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -39412,7 +36462,7 @@ index ab0badb3130e..fe7e6cd83f1f 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -143,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -39438,7 +36488,7 @@ index ab0badb3130e..fe7e6cd83f1f 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -171,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -170,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -39480,18 +36530,10 @@ index ab0badb3130e..fe7e6cd83f1f 100644
-
Library("rtc_media_gn")
diff --git third_party/libwebrtc/media/rtc_sdp_video_format_utils_gn/moz.build third_party/libwebrtc/media/rtc_sdp_video_format_utils_gn/moz.build
-index 38bdd82cbc57..27de3f907e68 100644
+index a1618fa38d5e..9969fddbb391 100644
--- third_party/libwebrtc/media/rtc_sdp_video_format_utils_gn/moz.build
+++ third_party/libwebrtc/media/rtc_sdp_video_format_utils_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -39499,6 +36541,7 @@ index 38bdd82cbc57..27de3f907e68 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -39507,23 +36550,18 @@ index 38bdd82cbc57..27de3f907e68 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -39542,10 +36580,6 @@ index 38bdd82cbc57..27de3f907e68 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -39553,10 +36587,6 @@ index 38bdd82cbc57..27de3f907e68 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -39564,7 +36594,6 @@ index 38bdd82cbc57..27de3f907e68 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -39572,10 +36601,6 @@ index 38bdd82cbc57..27de3f907e68 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -39588,10 +36613,6 @@ index 38bdd82cbc57..27de3f907e68 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -39629,7 +36650,7 @@ index 38bdd82cbc57..27de3f907e68 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -39687,10 +36708,10 @@ index 38bdd82cbc57..27de3f907e68 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -39701,10 +36722,10 @@ index 38bdd82cbc57..27de3f907e68 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -39716,18 +36737,10 @@ index 38bdd82cbc57..27de3f907e68 100644
Library("rtc_sdp_video_format_utils_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 66a71c40c4c3..68ac3e57788c 100644
+index 077f256b7ae4..1fce89407712 100644
--- third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
+++ third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -39735,6 +36748,7 @@ index 66a71c40c4c3..68ac3e57788c 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -39743,23 +36757,18 @@ index 66a71c40c4c3..68ac3e57788c 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -39779,10 +36788,6 @@ index 66a71c40c4c3..68ac3e57788c 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -39790,10 +36795,6 @@ index 66a71c40c4c3..68ac3e57788c 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -39801,7 +36802,6 @@ index 66a71c40c4c3..68ac3e57788c 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -39809,10 +36809,6 @@ index 66a71c40c4c3..68ac3e57788c 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -39825,10 +36821,6 @@ index 66a71c40c4c3..68ac3e57788c 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -39866,7 +36858,7 @@ index 66a71c40c4c3..68ac3e57788c 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -39924,10 +36916,10 @@ index 66a71c40c4c3..68ac3e57788c 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -39938,10 +36930,10 @@ index 66a71c40c4c3..68ac3e57788c 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -39953,7 +36945,7 @@ index 66a71c40c4c3..68ac3e57788c 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 4f6c7ecc79c1..05909ae9d9ab 100644
+index 718787db4fdc..148d2e911e47 100644
--- third_party/libwebrtc/media/rtp_utils_gn/moz.build
+++ third_party/libwebrtc/media/rtp_utils_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -39964,6 +36956,7 @@ index 4f6c7ecc79c1..05909ae9d9ab 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -39972,13 +36965,12 @@ index 4f6c7ecc79c1..05909ae9d9ab 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40013,7 +37005,6 @@ index 4f6c7ecc79c1..05909ae9d9ab 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -40063,7 +37054,7 @@ index 4f6c7ecc79c1..05909ae9d9ab 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -40089,7 +37080,7 @@ index 4f6c7ecc79c1..05909ae9d9ab 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -40131,7 +37122,7 @@ index 4f6c7ecc79c1..05909ae9d9ab 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 d55e6e09f06c..c4f947183b41 100644
+index 54aeb0b59974..af579ccfc539 100644
--- third_party/libwebrtc/media/stream_params_gn/moz.build
+++ third_party/libwebrtc/media/stream_params_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -40142,6 +37133,7 @@ index d55e6e09f06c..c4f947183b41 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -40150,13 +37142,12 @@ index d55e6e09f06c..c4f947183b41 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40191,7 +37182,6 @@ index d55e6e09f06c..c4f947183b41 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -40241,7 +37231,7 @@ index d55e6e09f06c..c4f947183b41 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -40267,7 +37257,7 @@ index d55e6e09f06c..c4f947183b41 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -40309,18 +37299,10 @@ index d55e6e09f06c..c4f947183b41 100644
-
Library("stream_params_gn")
diff --git third_party/libwebrtc/media/video_adapter_gn/moz.build third_party/libwebrtc/media/video_adapter_gn/moz.build
-index 4dc558ddbbb7..d620cd03ecc7 100644
+index b69a51a5983d..ededc9780d49 100644
--- third_party/libwebrtc/media/video_adapter_gn/moz.build
+++ third_party/libwebrtc/media/video_adapter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -40328,6 +37310,7 @@ index 4dc558ddbbb7..d620cd03ecc7 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -40336,23 +37319,18 @@ index 4dc558ddbbb7..d620cd03ecc7 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -40371,10 +37349,6 @@ index 4dc558ddbbb7..d620cd03ecc7 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -40382,10 +37356,6 @@ index 4dc558ddbbb7..d620cd03ecc7 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -40393,7 +37363,6 @@ index 4dc558ddbbb7..d620cd03ecc7 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -40401,10 +37370,6 @@ index 4dc558ddbbb7..d620cd03ecc7 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -40417,10 +37382,6 @@ index 4dc558ddbbb7..d620cd03ecc7 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -40458,7 +37419,7 @@ index 4dc558ddbbb7..d620cd03ecc7 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -40516,10 +37477,10 @@ index 4dc558ddbbb7..d620cd03ecc7 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -40530,10 +37491,10 @@ index 4dc558ddbbb7..d620cd03ecc7 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -40545,18 +37506,10 @@ index 4dc558ddbbb7..d620cd03ecc7 100644
Library("video_adapter_gn")
diff --git third_party/libwebrtc/media/video_broadcaster_gn/moz.build third_party/libwebrtc/media/video_broadcaster_gn/moz.build
-index a93d5af7f5fe..8c063e2cd0d2 100644
+index f615256ba4ed..c1f7fc585462 100644
--- third_party/libwebrtc/media/video_broadcaster_gn/moz.build
+++ third_party/libwebrtc/media/video_broadcaster_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -40564,6 +37517,7 @@ index a93d5af7f5fe..8c063e2cd0d2 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -40572,23 +37526,18 @@ index a93d5af7f5fe..8c063e2cd0d2 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -40607,10 +37556,6 @@ index a93d5af7f5fe..8c063e2cd0d2 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -40618,10 +37563,6 @@ index a93d5af7f5fe..8c063e2cd0d2 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -40629,7 +37570,6 @@ index a93d5af7f5fe..8c063e2cd0d2 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -40637,10 +37577,6 @@ index a93d5af7f5fe..8c063e2cd0d2 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -40653,10 +37589,6 @@ index a93d5af7f5fe..8c063e2cd0d2 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -40694,7 +37626,7 @@ index a93d5af7f5fe..8c063e2cd0d2 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -40752,10 +37684,10 @@ index a93d5af7f5fe..8c063e2cd0d2 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -40766,10 +37698,10 @@ index a93d5af7f5fe..8c063e2cd0d2 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -40781,18 +37713,10 @@ index a93d5af7f5fe..8c063e2cd0d2 100644
Library("video_broadcaster_gn")
diff --git third_party/libwebrtc/media/video_common_gn/moz.build third_party/libwebrtc/media/video_common_gn/moz.build
-index 6c29143ad9aa..1125008a4f6c 100644
+index 8fe45f5a5bd6..cea55451b02a 100644
--- third_party/libwebrtc/media/video_common_gn/moz.build
+++ third_party/libwebrtc/media/video_common_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -40800,6 +37724,7 @@ index 6c29143ad9aa..1125008a4f6c 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -40808,23 +37733,18 @@ index 6c29143ad9aa..1125008a4f6c 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -40843,10 +37763,6 @@ index 6c29143ad9aa..1125008a4f6c 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -40854,10 +37770,6 @@ index 6c29143ad9aa..1125008a4f6c 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -40865,7 +37777,6 @@ index 6c29143ad9aa..1125008a4f6c 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -40873,10 +37784,6 @@ index 6c29143ad9aa..1125008a4f6c 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -40889,10 +37796,6 @@ index 6c29143ad9aa..1125008a4f6c 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -40930,7 +37833,7 @@ index 6c29143ad9aa..1125008a4f6c 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -40988,10 +37891,10 @@ index 6c29143ad9aa..1125008a4f6c 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -41002,10 +37905,10 @@ index 6c29143ad9aa..1125008a4f6c 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -41017,18 +37920,10 @@ index 6c29143ad9aa..1125008a4f6c 100644
Library("video_common_gn")
diff --git third_party/libwebrtc/media/video_source_base_gn/moz.build third_party/libwebrtc/media/video_source_base_gn/moz.build
-index 4dc607134aac..546b829badfc 100644
+index 0c67351e481a..b7102601a5f8 100644
--- third_party/libwebrtc/media/video_source_base_gn/moz.build
+++ third_party/libwebrtc/media/video_source_base_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -41036,6 +37931,7 @@ index 4dc607134aac..546b829badfc 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -41044,23 +37940,18 @@ index 4dc607134aac..546b829badfc 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -41079,10 +37970,6 @@ index 4dc607134aac..546b829badfc 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -41090,10 +37977,6 @@ index 4dc607134aac..546b829badfc 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -41101,7 +37984,6 @@ index 4dc607134aac..546b829badfc 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -41109,10 +37991,6 @@ index 4dc607134aac..546b829badfc 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -41125,10 +38003,6 @@ index 4dc607134aac..546b829badfc 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -41166,7 +38040,7 @@ index 4dc607134aac..546b829badfc 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -41224,10 +38098,10 @@ index 4dc607134aac..546b829badfc 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -41238,10 +38112,10 @@ index 4dc607134aac..546b829badfc 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -41253,18 +38127,10 @@ index 4dc607134aac..546b829badfc 100644
Library("video_source_base_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 d46f1a759687..542b5a54b1f2 100644
+index 910b12a46a63..9220db367d82 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -41272,6 +38138,7 @@ index d46f1a759687..542b5a54b1f2 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -41280,23 +38147,18 @@ index d46f1a759687..542b5a54b1f2 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -41315,10 +38177,6 @@ index d46f1a759687..542b5a54b1f2 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -41326,10 +38184,6 @@ index d46f1a759687..542b5a54b1f2 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -41337,7 +38191,6 @@ index d46f1a759687..542b5a54b1f2 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -41345,10 +38198,6 @@ index d46f1a759687..542b5a54b1f2 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -41361,10 +38210,6 @@ index d46f1a759687..542b5a54b1f2 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -41402,7 +38247,7 @@ index d46f1a759687..542b5a54b1f2 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -41460,10 +38305,10 @@ index d46f1a759687..542b5a54b1f2 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -41474,10 +38319,10 @@ index d46f1a759687..542b5a54b1f2 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -41489,18 +38334,10 @@ index d46f1a759687..542b5a54b1f2 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 d82a5a14f4b8..778a9aafefbd 100644
+index 9c56b76d17a5..442c62b648b5 100644
--- third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -41508,6 +38345,7 @@ index d82a5a14f4b8..778a9aafefbd 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -41516,23 +38354,18 @@ index d82a5a14f4b8..778a9aafefbd 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -49,114 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -41551,10 +38384,6 @@ index d82a5a14f4b8..778a9aafefbd 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -41562,10 +38391,6 @@ index d82a5a14f4b8..778a9aafefbd 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -41573,7 +38398,6 @@ index d82a5a14f4b8..778a9aafefbd 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -41581,10 +38405,6 @@ index d82a5a14f4b8..778a9aafefbd 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -41597,10 +38417,6 @@ index d82a5a14f4b8..778a9aafefbd 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -41638,7 +38454,7 @@ index d82a5a14f4b8..778a9aafefbd 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -164,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -41696,10 +38512,10 @@ index d82a5a14f4b8..778a9aafefbd 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -41710,10 +38526,10 @@ index d82a5a14f4b8..778a9aafefbd 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -41725,7 +38541,7 @@ index d82a5a14f4b8..778a9aafefbd 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 318901c1a44e..295c746c4637 100644
+index 489b534c2fb3..7a4d82a43b5e 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -41736,6 +38552,7 @@ index 318901c1a44e..295c746c4637 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -41744,13 +38561,12 @@ index 318901c1a44e..295c746c4637 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41785,7 +38601,6 @@ index 318901c1a44e..295c746c4637 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -41835,7 +38650,7 @@ index 318901c1a44e..295c746c4637 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -41861,7 +38676,7 @@ index 318901c1a44e..295c746c4637 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -41903,18 +38718,10 @@ index 318901c1a44e..295c746c4637 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 faa1f1264733..db7345eab074 100644
+index 28a4474f3b01..c44eaba16b4e 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -41922,6 +38729,7 @@ index faa1f1264733..db7345eab074 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -41930,23 +38738,18 @@ index faa1f1264733..db7345eab074 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -41965,10 +38768,6 @@ index faa1f1264733..db7345eab074 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -41976,10 +38775,6 @@ index faa1f1264733..db7345eab074 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -41987,7 +38782,6 @@ index faa1f1264733..db7345eab074 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -41995,10 +38789,6 @@ index faa1f1264733..db7345eab074 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -42011,10 +38801,6 @@ index faa1f1264733..db7345eab074 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -42052,7 +38838,7 @@ index faa1f1264733..db7345eab074 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -42110,10 +38896,10 @@ index faa1f1264733..db7345eab074 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -42124,10 +38910,10 @@ index faa1f1264733..db7345eab074 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -42139,18 +38925,10 @@ index faa1f1264733..db7345eab074 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 17b5510ed9c7..18e473fd2581 100644
+index c334503506ad..d0c66e82a230 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -42158,6 +38936,7 @@ index 17b5510ed9c7..18e473fd2581 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -42166,23 +38945,18 @@ index 17b5510ed9c7..18e473fd2581 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -42201,10 +38975,6 @@ index 17b5510ed9c7..18e473fd2581 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -42212,10 +38982,6 @@ index 17b5510ed9c7..18e473fd2581 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -42223,7 +38989,6 @@ index 17b5510ed9c7..18e473fd2581 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -42231,10 +38996,6 @@ index 17b5510ed9c7..18e473fd2581 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -42247,10 +39008,6 @@ index 17b5510ed9c7..18e473fd2581 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -42288,7 +39045,7 @@ index 17b5510ed9c7..18e473fd2581 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -42346,10 +39103,10 @@ index 17b5510ed9c7..18e473fd2581 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -42360,10 +39117,10 @@ index 17b5510ed9c7..18e473fd2581 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -42375,18 +39132,10 @@ index 17b5510ed9c7..18e473fd2581 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 cda4075cf2bc..01b991429a96 100644
+index a8342784a2e6..9b789e0e576c 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -42394,6 +39143,7 @@ index cda4075cf2bc..01b991429a96 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -42402,23 +39152,18 @@ index cda4075cf2bc..01b991429a96 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,103 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -42433,10 +39178,6 @@ index cda4075cf2bc..01b991429a96 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -42444,10 +39185,6 @@ index cda4075cf2bc..01b991429a96 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -42455,7 +39192,6 @@ index cda4075cf2bc..01b991429a96 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -42463,10 +39199,6 @@ index cda4075cf2bc..01b991429a96 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -42479,10 +39211,6 @@ index cda4075cf2bc..01b991429a96 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -42513,7 +39241,7 @@ index cda4075cf2bc..01b991429a96 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -150,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -42571,10 +39299,10 @@ index cda4075cf2bc..01b991429a96 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -42585,10 +39313,10 @@ index cda4075cf2bc..01b991429a96 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -42600,18 +39328,10 @@ index cda4075cf2bc..01b991429a96 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 7caacff1ca9c..5364c2abc969 100644
+index 98b4ab3b43dc..ccae536ad564 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -42619,6 +39339,7 @@ index 7caacff1ca9c..5364c2abc969 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -42627,23 +39348,18 @@ index 7caacff1ca9c..5364c2abc969 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -56,114 +69,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -56,93 +65,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -42662,10 +39378,6 @@ index 7caacff1ca9c..5364c2abc969 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -42673,10 +39385,6 @@ index 7caacff1ca9c..5364c2abc969 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -42684,7 +39392,6 @@ index 7caacff1ca9c..5364c2abc969 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -42692,10 +39399,6 @@ index 7caacff1ca9c..5364c2abc969 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -42708,10 +39411,6 @@ index 7caacff1ca9c..5364c2abc969 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -42749,7 +39448,7 @@ index 7caacff1ca9c..5364c2abc969 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -171,82 +77,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -150,82 +73,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -42807,10 +39506,10 @@ index 7caacff1ca9c..5364c2abc969 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -42821,10 +39520,10 @@ index 7caacff1ca9c..5364c2abc969 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -42836,7 +39535,7 @@ index 7caacff1ca9c..5364c2abc969 100644
Library("audio_network_adaptor_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 3a67db4a6326..9d507b56f1b9 100644
+index b83a1cfcfb20..131a60705075 100644
--- third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -42847,6 +39546,7 @@ index 3a67db4a6326..9d507b56f1b9 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -42855,13 +39555,12 @@ index 3a67db4a6326..9d507b56f1b9 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,83 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42896,7 +39595,6 @@ index 3a67db4a6326..9d507b56f1b9 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -42946,7 +39644,7 @@ index 3a67db4a6326..9d507b56f1b9 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -43033,18 +39731,10 @@ index 3a67db4a6326..9d507b56f1b9 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 eb2bea17da78..010e4bca5d7a 100644
+index 1675e90d8790..d01e4b686418 100644
--- third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -43052,6 +39742,7 @@ index eb2bea17da78..010e4bca5d7a 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -43060,23 +39751,18 @@ index eb2bea17da78..010e4bca5d7a 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -43095,10 +39781,6 @@ index eb2bea17da78..010e4bca5d7a 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -43106,10 +39788,6 @@ index eb2bea17da78..010e4bca5d7a 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -43117,7 +39795,6 @@ index eb2bea17da78..010e4bca5d7a 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -43125,10 +39802,6 @@ index eb2bea17da78..010e4bca5d7a 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -43141,10 +39814,6 @@ index eb2bea17da78..010e4bca5d7a 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -43182,7 +39851,7 @@ index eb2bea17da78..010e4bca5d7a 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -43240,10 +39909,10 @@ index eb2bea17da78..010e4bca5d7a 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -43254,10 +39923,10 @@ index eb2bea17da78..010e4bca5d7a 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -43269,7 +39938,7 @@ index eb2bea17da78..010e4bca5d7a 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 16611741d3a7..324042e8bb7b 100644
+index fa99447ca050..44978ebedb1d 100644
--- third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -43280,6 +39949,7 @@ index 16611741d3a7..324042e8bb7b 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -43288,13 +39958,12 @@ index 16611741d3a7..324042e8bb7b 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,83 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43329,7 +39998,6 @@ index 16611741d3a7..324042e8bb7b 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -43379,7 +40047,7 @@ index 16611741d3a7..324042e8bb7b 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -43466,18 +40134,10 @@ index 16611741d3a7..324042e8bb7b 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 532a8c1f6de6..eade52d13d0d 100644
+index fa074502a127..4f9ad9cd4a62 100644
--- third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -43485,6 +40145,7 @@ index 532a8c1f6de6..eade52d13d0d 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -43493,23 +40154,18 @@ index 532a8c1f6de6..eade52d13d0d 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -43528,10 +40184,6 @@ index 532a8c1f6de6..eade52d13d0d 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -43539,10 +40191,6 @@ index 532a8c1f6de6..eade52d13d0d 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -43550,7 +40198,6 @@ index 532a8c1f6de6..eade52d13d0d 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -43558,10 +40205,6 @@ index 532a8c1f6de6..eade52d13d0d 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -43574,10 +40217,6 @@ index 532a8c1f6de6..eade52d13d0d 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -43615,7 +40254,7 @@ index 532a8c1f6de6..eade52d13d0d 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -43673,10 +40312,10 @@ index 532a8c1f6de6..eade52d13d0d 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -43687,10 +40326,10 @@ index 532a8c1f6de6..eade52d13d0d 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -43702,7 +40341,7 @@ index 532a8c1f6de6..eade52d13d0d 100644
Library("g722_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 b8dd874ca987..33ad21e88a9b 100644
+index deddbd7bc6a3..279051a8188f 100644
--- third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -43713,6 +40352,7 @@ index b8dd874ca987..33ad21e88a9b 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -43721,13 +40361,12 @@ index b8dd874ca987..33ad21e88a9b 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43762,7 +40401,6 @@ index b8dd874ca987..33ad21e88a9b 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -43812,7 +40450,7 @@ index b8dd874ca987..33ad21e88a9b 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -43838,7 +40476,7 @@ index b8dd874ca987..33ad21e88a9b 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -43880,7 +40518,7 @@ index b8dd874ca987..33ad21e88a9b 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 6c96470ac113..6f26b7613ac0 100644
+index 9a2813ef474b..975128b1fe25 100644
--- third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -43891,6 +40529,7 @@ index 6c96470ac113..6f26b7613ac0 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -43899,13 +40538,12 @@ index 6c96470ac113..6f26b7613ac0 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -49,83 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,82 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43940,7 +40578,6 @@ index 6c96470ac113..6f26b7613ac0 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -43990,7 +40627,7 @@ index 6c96470ac113..6f26b7613ac0 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -133,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -132,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -44077,18 +40714,10 @@ index 6c96470ac113..6f26b7613ac0 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 c42f54743647..ef46df1da4fc 100644
+index 68845ebff19a..1463a804bbff 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -44096,6 +40725,7 @@ index c42f54743647..ef46df1da4fc 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -44104,23 +40734,18 @@ index c42f54743647..ef46df1da4fc 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -44139,10 +40764,6 @@ index c42f54743647..ef46df1da4fc 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -44150,10 +40771,6 @@ index c42f54743647..ef46df1da4fc 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -44161,7 +40778,6 @@ index c42f54743647..ef46df1da4fc 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -44169,10 +40785,6 @@ index c42f54743647..ef46df1da4fc 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -44185,10 +40797,6 @@ index c42f54743647..ef46df1da4fc 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -44226,7 +40834,7 @@ index c42f54743647..ef46df1da4fc 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -44284,10 +40892,10 @@ index c42f54743647..ef46df1da4fc 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -44298,10 +40906,10 @@ index c42f54743647..ef46df1da4fc 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -44313,18 +40921,10 @@ index c42f54743647..ef46df1da4fc 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 61d03c2b24c2..5df332e08375 100644
+index b7100e120ab2..7e31677674ef 100644
--- third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -44332,6 +40932,7 @@ index 61d03c2b24c2..5df332e08375 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -44340,23 +40941,18 @@ index 61d03c2b24c2..5df332e08375 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -81,114 +94,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -81,93 +90,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -44375,10 +40971,6 @@ index 61d03c2b24c2..5df332e08375 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -44386,10 +40978,6 @@ index 61d03c2b24c2..5df332e08375 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -44397,7 +40985,6 @@ index 61d03c2b24c2..5df332e08375 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -44405,10 +40992,6 @@ index 61d03c2b24c2..5df332e08375 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -44421,10 +41004,6 @@ index 61d03c2b24c2..5df332e08375 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -44462,7 +41041,7 @@ index 61d03c2b24c2..5df332e08375 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -196,82 +102,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -175,82 +98,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -44549,7 +41128,7 @@ index 61d03c2b24c2..5df332e08375 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 5f8526cb4069..55d6407090fc 100644
+index 1f9fc4f74a1a..8dfe667be13c 100644
--- third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -44560,6 +41139,7 @@ index 5f8526cb4069..55d6407090fc 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -44568,13 +41148,12 @@ index 5f8526cb4069..55d6407090fc 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,83 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44609,7 +41188,6 @@ index 5f8526cb4069..55d6407090fc 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -44659,7 +41237,7 @@ index 5f8526cb4069..55d6407090fc 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -44746,18 +41324,10 @@ index 5f8526cb4069..55d6407090fc 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 428977fd1acf..cce6098221c5 100644
+index db4b694011a3..8abc614eedbe 100644
--- third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -44765,6 +41335,7 @@ index 428977fd1acf..cce6098221c5 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -44773,23 +41344,18 @@ index 428977fd1acf..cce6098221c5 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -48,114 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -44808,10 +41374,6 @@ index 428977fd1acf..cce6098221c5 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -44819,10 +41381,6 @@ index 428977fd1acf..cce6098221c5 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -44830,7 +41388,6 @@ index 428977fd1acf..cce6098221c5 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -44838,10 +41395,6 @@ index 428977fd1acf..cce6098221c5 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -44854,10 +41407,6 @@ index 428977fd1acf..cce6098221c5 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -44895,7 +41444,7 @@ index 428977fd1acf..cce6098221c5 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -163,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -44953,10 +41502,10 @@ index 428977fd1acf..cce6098221c5 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -44967,10 +41516,10 @@ index 428977fd1acf..cce6098221c5 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -44982,18 +41531,10 @@ index 428977fd1acf..cce6098221c5 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 773bab244a03..351564a69485 100644
+index 7896cb765a18..f16ef0cde7d2 100644
--- third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -45001,6 +41542,7 @@ index 773bab244a03..351564a69485 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -45009,23 +41551,18 @@ index 773bab244a03..351564a69485 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -45044,10 +41581,6 @@ index 773bab244a03..351564a69485 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -45055,10 +41588,6 @@ index 773bab244a03..351564a69485 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -45066,7 +41595,6 @@ index 773bab244a03..351564a69485 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -45074,10 +41602,6 @@ index 773bab244a03..351564a69485 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -45090,10 +41614,6 @@ index 773bab244a03..351564a69485 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -45131,7 +41651,7 @@ index 773bab244a03..351564a69485 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -45189,10 +41709,10 @@ index 773bab244a03..351564a69485 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -45203,10 +41723,10 @@ index 773bab244a03..351564a69485 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -45218,18 +41738,10 @@ index 773bab244a03..351564a69485 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 4104878e3d6a..c599a97f8fcf 100644
+index d81c924c7314..bf58ee8f6ccc 100644
--- third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -45237,6 +41749,7 @@ index 4104878e3d6a..c599a97f8fcf 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -45245,23 +41758,18 @@ index 4104878e3d6a..c599a97f8fcf 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -45280,10 +41788,6 @@ index 4104878e3d6a..c599a97f8fcf 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -45291,10 +41795,6 @@ index 4104878e3d6a..c599a97f8fcf 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -45302,7 +41802,6 @@ index 4104878e3d6a..c599a97f8fcf 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -45310,10 +41809,6 @@ index 4104878e3d6a..c599a97f8fcf 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -45326,10 +41821,6 @@ index 4104878e3d6a..c599a97f8fcf 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -45360,7 +41851,7 @@ index 4104878e3d6a..c599a97f8fcf 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -45447,18 +41938,10 @@ index 4104878e3d6a..c599a97f8fcf 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 9403fd91f3d2..2991ddf102f6 100644
+index c79834bb21b0..1d99ea5b574c 100644
--- third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
-@@ -9,18 +9,31 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,6 +13,9 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -45467,7 +41950,8 @@ index 9403fd91f3d2..2991ddf102f6 100644
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_CODEC_OPUS"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+@@ -20,7 +23,13 @@ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
DEFINES["WEBRTC_OPUS_SUPPORT_120MS_PTIME"] = "1"
@@ -45476,23 +41960,18 @@ index 9403fd91f3d2..2991ddf102f6 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -50,114 +63,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,93 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -45511,10 +41990,6 @@ index 9403fd91f3d2..2991ddf102f6 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -45522,10 +41997,6 @@ index 9403fd91f3d2..2991ddf102f6 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -45533,7 +42004,6 @@ index 9403fd91f3d2..2991ddf102f6 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -45541,10 +42011,6 @@ index 9403fd91f3d2..2991ddf102f6 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -45557,10 +42023,6 @@ index 9403fd91f3d2..2991ddf102f6 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -45598,7 +42060,7 @@ index 9403fd91f3d2..2991ddf102f6 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -165,82 +71,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -144,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -45656,10 +42118,10 @@ index 9403fd91f3d2..2991ddf102f6 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -45670,10 +42132,10 @@ index 9403fd91f3d2..2991ddf102f6 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -45685,18 +42147,10 @@ index 9403fd91f3d2..2991ddf102f6 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 f3aaa0d67bdc..08c694f63e18 100644
+index 359c64bca323..ca89800b1f98 100644
--- third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
-@@ -9,18 +9,31 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,6 +13,9 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -45705,7 +42159,8 @@ index f3aaa0d67bdc..08c694f63e18 100644
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_CODEC_OPUS"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+@@ -20,7 +23,13 @@ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
DEFINES["WEBRTC_OPUS_SUPPORT_120MS_PTIME"] = "1"
@@ -45714,23 +42169,18 @@ index f3aaa0d67bdc..08c694f63e18 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -50,114 +63,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,93 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -45749,10 +42199,6 @@ index f3aaa0d67bdc..08c694f63e18 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -45760,10 +42206,6 @@ index f3aaa0d67bdc..08c694f63e18 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -45771,7 +42213,6 @@ index f3aaa0d67bdc..08c694f63e18 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -45779,10 +42220,6 @@ index f3aaa0d67bdc..08c694f63e18 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -45795,10 +42232,6 @@ index f3aaa0d67bdc..08c694f63e18 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -45836,7 +42269,7 @@ index f3aaa0d67bdc..08c694f63e18 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -165,82 +71,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -144,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -45894,10 +42327,10 @@ index f3aaa0d67bdc..08c694f63e18 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -45908,10 +42341,10 @@ index f3aaa0d67bdc..08c694f63e18 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -45923,18 +42356,10 @@ index f3aaa0d67bdc..08c694f63e18 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 86fc3f405429..5f8f8e535835 100644
+index e255da9f0e5d..cbdb8e61184f 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
-@@ -9,18 +9,31 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,6 +13,9 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -45943,7 +42368,8 @@ index 86fc3f405429..5f8f8e535835 100644
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_CODEC_OPUS"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+@@ -20,7 +23,13 @@ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
DEFINES["WEBRTC_OPUS_SUPPORT_120MS_PTIME"] = "1"
@@ -45952,23 +42378,18 @@ index 86fc3f405429..5f8f8e535835 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -49,107 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,86 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -45987,10 +42408,6 @@ index 86fc3f405429..5f8f8e535835 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -45998,10 +42415,6 @@ index 86fc3f405429..5f8f8e535835 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -46009,7 +42422,6 @@ index 86fc3f405429..5f8f8e535835 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -46017,10 +42429,6 @@ index 86fc3f405429..5f8f8e535835 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -46033,10 +42441,6 @@ index 86fc3f405429..5f8f8e535835 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -46067,7 +42471,7 @@ index 86fc3f405429..5f8f8e535835 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -157,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -46154,7 +42558,7 @@ index 86fc3f405429..5f8f8e535835 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 87d11c2579e5..8406c1f27370 100644
+index 32a52b9ad4dc..1812ab6bedf8 100644
--- third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
+++ third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -46165,6 +42569,7 @@ index 87d11c2579e5..8406c1f27370 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -46173,13 +42578,12 @@ index 87d11c2579e5..8406c1f27370 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46214,7 +42618,6 @@ index 87d11c2579e5..8406c1f27370 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -46264,7 +42667,7 @@ index 87d11c2579e5..8406c1f27370 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -46290,7 +42693,7 @@ index 87d11c2579e5..8406c1f27370 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -46332,18 +42735,10 @@ index 87d11c2579e5..8406c1f27370 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 c7e35781d9d6..ca6b5b3e12d6 100644
+index 84025f54a42e..67a9ba3e660f 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -46351,6 +42746,7 @@ index c7e35781d9d6..ca6b5b3e12d6 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -46359,23 +42755,18 @@ index c7e35781d9d6..ca6b5b3e12d6 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -46394,10 +42785,6 @@ index c7e35781d9d6..ca6b5b3e12d6 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -46405,10 +42792,6 @@ index c7e35781d9d6..ca6b5b3e12d6 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -46416,7 +42799,6 @@ index c7e35781d9d6..ca6b5b3e12d6 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -46424,10 +42806,6 @@ index c7e35781d9d6..ca6b5b3e12d6 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -46440,10 +42818,6 @@ index c7e35781d9d6..ca6b5b3e12d6 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -46481,7 +42855,7 @@ index c7e35781d9d6..ca6b5b3e12d6 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -46539,10 +42913,10 @@ index c7e35781d9d6..ca6b5b3e12d6 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -46553,10 +42927,10 @@ index c7e35781d9d6..ca6b5b3e12d6 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -46568,18 +42942,10 @@ index c7e35781d9d6..ca6b5b3e12d6 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 168b462ae903..67171da3d582 100644
+index 266eeae7423d..29d13fa8a836 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
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -46588,6 +42954,7 @@ index 168b462ae903..67171da3d582 100644
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -46596,23 +42963,18 @@ index 168b462ae903..67171da3d582 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -49,114 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -46631,10 +42993,6 @@ index 168b462ae903..67171da3d582 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -46642,10 +43000,6 @@ index 168b462ae903..67171da3d582 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -46653,7 +43007,6 @@ index 168b462ae903..67171da3d582 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -46661,10 +43014,6 @@ index 168b462ae903..67171da3d582 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -46677,10 +43026,6 @@ index 168b462ae903..67171da3d582 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -46718,7 +43063,7 @@ index 168b462ae903..67171da3d582 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -164,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -46776,10 +43121,10 @@ index 168b462ae903..67171da3d582 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -46790,10 +43135,10 @@ index 168b462ae903..67171da3d582 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -46805,7 +43150,7 @@ index 168b462ae903..67171da3d582 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 a5ea7a055c2a..257c41f92e45 100644
+index 67dbd0364954..af1781edae5a 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -46816,6 +43161,7 @@ index a5ea7a055c2a..257c41f92e45 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -46824,13 +43170,12 @@ index a5ea7a055c2a..257c41f92e45 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46869,7 +43214,6 @@ index a5ea7a055c2a..257c41f92e45 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -46919,7 +43263,7 @@ index a5ea7a055c2a..257c41f92e45 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -46945,7 +43289,7 @@ index a5ea7a055c2a..257c41f92e45 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -46987,7 +43331,7 @@ index a5ea7a055c2a..257c41f92e45 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 1c7aed16fb44..ff5f6f5c6b52 100644
+index 826757be30b2..248e97af3f24 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -46998,6 +43342,7 @@ index 1c7aed16fb44..ff5f6f5c6b52 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -47006,13 +43351,12 @@ index 1c7aed16fb44..ff5f6f5c6b52 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47051,7 +43395,6 @@ index 1c7aed16fb44..ff5f6f5c6b52 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -47108,7 +43451,7 @@ index 1c7aed16fb44..ff5f6f5c6b52 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -47134,7 +43477,7 @@ index 1c7aed16fb44..ff5f6f5c6b52 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -47176,19 +43519,10 @@ index 1c7aed16fb44..ff5f6f5c6b52 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 b199b50b1ec1..c7db7f029811 100644
+index 841514fe7c05..07f83ec4dd88 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
-@@ -11,21 +11,31 @@ AllowCompilerWarnings()
-
- CXXFLAGS += [
- "-mavx2",
-- "-mfma"
-+ "-mfma",
-+ "-std=gnu++20"
- ]
-
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -18,14 +18,23 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -47198,6 +43532,7 @@ index b199b50b1ec1..c7db7f029811 100644
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -47206,23 +43541,18 @@ index b199b50b1ec1..c7db7f029811 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -57,143 +67,9 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -57,122 +66,9 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -47241,10 +43571,6 @@ index b199b50b1ec1..c7db7f029811 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -47252,10 +43578,6 @@ index b199b50b1ec1..c7db7f029811 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -47263,7 +43585,6 @@ index b199b50b1ec1..c7db7f029811 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_GNU_SOURCE"] = True
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
@@ -47272,10 +43593,6 @@ index b199b50b1ec1..c7db7f029811 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -47288,10 +43605,6 @@ index b199b50b1ec1..c7db7f029811 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -47358,7 +43671,7 @@ index b199b50b1ec1..c7db7f029811 100644
CXXFLAGS += [
"-msse2"
diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
-index e4aecfab22ab..c4156a9ff2f4 100644
+index 8ee5cb9e07a8..87efd357dcbd 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -47369,6 +43682,7 @@ index e4aecfab22ab..c4156a9ff2f4 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -47377,13 +43691,12 @@ index e4aecfab22ab..c4156a9ff2f4 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47418,7 +43731,6 @@ index e4aecfab22ab..c4156a9ff2f4 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -47468,7 +43780,7 @@ index e4aecfab22ab..c4156a9ff2f4 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -47494,7 +43806,7 @@ index e4aecfab22ab..c4156a9ff2f4 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -47536,7 +43848,7 @@ index e4aecfab22ab..c4156a9ff2f4 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 f891acfdb6bc..09b3550994f4 100644
+index 0a4f5b6f98bf..2f6d1401854f 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -47547,6 +43859,7 @@ index f891acfdb6bc..09b3550994f4 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -47555,13 +43868,12 @@ index f891acfdb6bc..09b3550994f4 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47600,7 +43912,6 @@ index f891acfdb6bc..09b3550994f4 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -47657,7 +43968,7 @@ index f891acfdb6bc..09b3550994f4 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -47683,7 +43994,7 @@ index f891acfdb6bc..09b3550994f4 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -47725,18 +44036,10 @@ index f891acfdb6bc..09b3550994f4 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 deb61ac306cd..7e0457fca6db 100644
+index 7ba40bca2b1a..ab0e74825f70 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -47745,6 +44048,7 @@ index deb61ac306cd..7e0457fca6db 100644
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -47753,23 +44057,18 @@ index deb61ac306cd..7e0457fca6db 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -103,114 +116,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -103,93 +112,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -47788,10 +44087,6 @@ index deb61ac306cd..7e0457fca6db 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -47799,10 +44094,6 @@ index deb61ac306cd..7e0457fca6db 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -47810,7 +44101,6 @@ index deb61ac306cd..7e0457fca6db 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -47818,10 +44108,6 @@ index deb61ac306cd..7e0457fca6db 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -47834,10 +44120,6 @@ index deb61ac306cd..7e0457fca6db 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -47875,7 +44157,7 @@ index deb61ac306cd..7e0457fca6db 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -218,82 +124,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -197,82 +120,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -47962,7 +44244,7 @@ index deb61ac306cd..7e0457fca6db 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 595f2c8257c5..5decd286f131 100644
+index f65afa9ac2f6..46165a8d7f41 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -47973,6 +44255,7 @@ index 595f2c8257c5..5decd286f131 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -47981,13 +44264,12 @@ index 595f2c8257c5..5decd286f131 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48026,7 +44308,6 @@ index 595f2c8257c5..5decd286f131 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -48076,7 +44357,7 @@ index 595f2c8257c5..5decd286f131 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -48102,7 +44383,7 @@ index 595f2c8257c5..5decd286f131 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -48144,7 +44425,7 @@ index 595f2c8257c5..5decd286f131 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 afb8ec4fcc88..5db219d43ef4 100644
+index 511f5e83ffca..803c26a3f14e 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -48155,6 +44436,7 @@ index afb8ec4fcc88..5db219d43ef4 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -48163,13 +44445,12 @@ index afb8ec4fcc88..5db219d43ef4 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48208,7 +44489,6 @@ index afb8ec4fcc88..5db219d43ef4 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -48258,7 +44538,7 @@ index afb8ec4fcc88..5db219d43ef4 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -48284,7 +44564,7 @@ index afb8ec4fcc88..5db219d43ef4 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -48326,7 +44606,7 @@ index afb8ec4fcc88..5db219d43ef4 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 eff40ca1ec3b..a552fc95aca4 100644
+index dd3a8042526c..a61dbeb42dac 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -48337,6 +44617,7 @@ index eff40ca1ec3b..a552fc95aca4 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -48345,13 +44626,12 @@ index eff40ca1ec3b..a552fc95aca4 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48390,7 +44670,6 @@ index eff40ca1ec3b..a552fc95aca4 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -48440,7 +44719,7 @@ index eff40ca1ec3b..a552fc95aca4 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -48466,7 +44745,7 @@ index eff40ca1ec3b..a552fc95aca4 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -48508,7 +44787,7 @@ index eff40ca1ec3b..a552fc95aca4 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 2f5d61998ddb..1475e1f30524 100644
+index 1a8f09ed9c10..4ebff1919c6f 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -48519,6 +44798,7 @@ index 2f5d61998ddb..1475e1f30524 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -48527,13 +44807,12 @@ index 2f5d61998ddb..1475e1f30524 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48572,7 +44851,6 @@ index 2f5d61998ddb..1475e1f30524 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -48622,7 +44900,7 @@ index 2f5d61998ddb..1475e1f30524 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -48648,7 +44926,7 @@ index 2f5d61998ddb..1475e1f30524 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -48690,7 +44968,7 @@ index 2f5d61998ddb..1475e1f30524 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 2cdcfb48d81f..fe42eaa02d10 100644
+index 0fc8981378df..411bcb480900 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -48701,6 +44979,7 @@ index 2cdcfb48d81f..fe42eaa02d10 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -48709,13 +44988,12 @@ index 2cdcfb48d81f..fe42eaa02d10 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48754,7 +45032,6 @@ index 2cdcfb48d81f..fe42eaa02d10 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -48811,7 +45088,7 @@ index 2cdcfb48d81f..fe42eaa02d10 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -48837,7 +45114,7 @@ index 2cdcfb48d81f..fe42eaa02d10 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -48879,18 +45156,10 @@ index 2cdcfb48d81f..fe42eaa02d10 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 a2d83ddf0b3d..a4a5c2aa7805 100644
+index 8856ebd34b1d..58073c04a13f 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -48898,6 +45167,7 @@ index a2d83ddf0b3d..a4a5c2aa7805 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -48906,23 +45176,18 @@ index a2d83ddf0b3d..a4a5c2aa7805 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -48941,10 +45206,6 @@ index a2d83ddf0b3d..a4a5c2aa7805 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -48952,10 +45213,6 @@ index a2d83ddf0b3d..a4a5c2aa7805 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -48963,7 +45220,6 @@ index a2d83ddf0b3d..a4a5c2aa7805 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -48971,10 +45227,6 @@ index a2d83ddf0b3d..a4a5c2aa7805 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -48987,10 +45239,6 @@ index a2d83ddf0b3d..a4a5c2aa7805 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -49028,7 +45276,7 @@ index a2d83ddf0b3d..a4a5c2aa7805 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -49086,10 +45334,10 @@ index a2d83ddf0b3d..a4a5c2aa7805 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -49100,10 +45348,10 @@ index a2d83ddf0b3d..a4a5c2aa7805 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -49115,18 +45363,10 @@ index a2d83ddf0b3d..a4a5c2aa7805 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 5e57979690e7..0c17eeaf4606 100644
+index 27439b35bb70..02b5f3aa25f7 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -49134,6 +45374,7 @@ index 5e57979690e7..0c17eeaf4606 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -49142,23 +45383,18 @@ index 5e57979690e7..0c17eeaf4606 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -49177,10 +45413,6 @@ index 5e57979690e7..0c17eeaf4606 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -49188,10 +45420,6 @@ index 5e57979690e7..0c17eeaf4606 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -49199,7 +45427,6 @@ index 5e57979690e7..0c17eeaf4606 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -49207,10 +45434,6 @@ index 5e57979690e7..0c17eeaf4606 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -49223,10 +45446,6 @@ index 5e57979690e7..0c17eeaf4606 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -49264,7 +45483,7 @@ index 5e57979690e7..0c17eeaf4606 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -49322,10 +45541,10 @@ index 5e57979690e7..0c17eeaf4606 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -49336,10 +45555,10 @@ index 5e57979690e7..0c17eeaf4606 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -49351,18 +45570,10 @@ index 5e57979690e7..0c17eeaf4606 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 77ba6c3ff20d..31a5bd1a8db5 100644
+index 60d496606730..f7b819222e3d 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -49370,6 +45581,7 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -49378,23 +45590,18 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,123 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,102 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -49417,10 +45624,6 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -49432,10 +45635,6 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -49443,7 +45642,6 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -49451,10 +45649,6 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -49471,10 +45665,6 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -49509,7 +45699,7 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -172,27 +69,12 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -151,27 +65,12 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["__ARM_NEON__"] = "1"
SOURCES += [
@@ -49538,7 +45728,7 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
SOURCES += [
"/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
]
-@@ -201,7 +83,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -180,7 +79,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
DEFINES["MIPS32_LE"] = True
DEFINES["MIPS_FPU_LE"] = True
@@ -49546,7 +45736,7 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
SOURCES += [
"/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_mips.cc"
-@@ -209,8 +90,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -188,8 +86,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
if CONFIG["TARGET_CPU"] == "mips64":
@@ -49555,7 +45745,7 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
SOURCES += [
"/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
]
-@@ -221,77 +100,27 @@ if CONFIG["TARGET_CPU"] == "ppc64":
+@@ -200,77 +96,27 @@ if CONFIG["TARGET_CPU"] == "ppc64":
"/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
]
@@ -49604,18 +45794,18 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
-
- DEFINES["_GNU_SOURCE"] = True
--
-- SOURCES += [
-- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
-- ]
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64":
+if CONFIG["TARGET_CPU"] == "riscv64":
SOURCES += [
"/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
]
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64":
+-
+- SOURCES += [
+- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+if CONFIG["TARGET_CPU"] == "x86":
@@ -49639,18 +45829,10 @@ index 77ba6c3ff20d..31a5bd1a8db5 100644
SOURCES += [
"/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
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 83396ea27045..8705ee7bcbdc 100644
+index b3eada70e070..1e05f9215cb7 100644
--- third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -49659,6 +45841,7 @@ index 83396ea27045..8705ee7bcbdc 100644
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -49667,23 +45850,18 @@ index 83396ea27045..8705ee7bcbdc 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -49702,10 +45880,6 @@ index 83396ea27045..8705ee7bcbdc 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -49713,10 +45887,6 @@ index 83396ea27045..8705ee7bcbdc 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -49724,7 +45894,6 @@ index 83396ea27045..8705ee7bcbdc 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -49732,10 +45901,6 @@ index 83396ea27045..8705ee7bcbdc 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -49748,10 +45913,6 @@ index 83396ea27045..8705ee7bcbdc 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -49789,7 +45950,7 @@ index 83396ea27045..8705ee7bcbdc 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -49847,10 +46008,10 @@ index 83396ea27045..8705ee7bcbdc 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -49861,10 +46022,10 @@ index 83396ea27045..8705ee7bcbdc 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -49876,7 +46037,7 @@ index 83396ea27045..8705ee7bcbdc 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 efe63a81707f..c96d332898a4 100644
+index 8e992e81b365..04869edc3c5f 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -49887,6 +46048,7 @@ index efe63a81707f..c96d332898a4 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -49895,13 +46057,12 @@ index efe63a81707f..c96d332898a4 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49936,7 +46097,6 @@ index efe63a81707f..c96d332898a4 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -49986,7 +46146,7 @@ index efe63a81707f..c96d332898a4 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -50012,7 +46172,7 @@ index efe63a81707f..c96d332898a4 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -50054,18 +46214,10 @@ index efe63a81707f..c96d332898a4 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 64296ecfebc2..6b25d2368901 100644
+index 5cb20550eb9b..63d3222f12fc 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -50073,6 +46225,7 @@ index 64296ecfebc2..6b25d2368901 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -50081,23 +46234,18 @@ index 64296ecfebc2..6b25d2368901 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -50116,10 +46264,6 @@ index 64296ecfebc2..6b25d2368901 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -50127,10 +46271,6 @@ index 64296ecfebc2..6b25d2368901 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -50138,7 +46278,6 @@ index 64296ecfebc2..6b25d2368901 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -50146,10 +46285,6 @@ index 64296ecfebc2..6b25d2368901 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -50162,10 +46297,6 @@ index 64296ecfebc2..6b25d2368901 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -50203,7 +46334,7 @@ index 64296ecfebc2..6b25d2368901 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -50261,10 +46392,10 @@ index 64296ecfebc2..6b25d2368901 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -50275,10 +46406,10 @@ index 64296ecfebc2..6b25d2368901 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -50290,18 +46421,10 @@ index 64296ecfebc2..6b25d2368901 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 06fa8de95211..34978e1ca94d 100644
+index 60bc520f030d..3539b6f3f359 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -50309,6 +46432,7 @@ index 06fa8de95211..34978e1ca94d 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -50317,23 +46441,18 @@ index 06fa8de95211..34978e1ca94d 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -48,114 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -50352,10 +46471,6 @@ index 06fa8de95211..34978e1ca94d 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -50363,10 +46478,6 @@ index 06fa8de95211..34978e1ca94d 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -50374,7 +46485,6 @@ index 06fa8de95211..34978e1ca94d 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -50382,10 +46492,6 @@ index 06fa8de95211..34978e1ca94d 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -50398,10 +46504,6 @@ index 06fa8de95211..34978e1ca94d 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -50439,7 +46541,7 @@ index 06fa8de95211..34978e1ca94d 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -163,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -50497,10 +46599,10 @@ index 06fa8de95211..34978e1ca94d 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -50511,10 +46613,10 @@ index 06fa8de95211..34978e1ca94d 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -50526,18 +46628,10 @@ index 06fa8de95211..34978e1ca94d 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 dbb2c6020758..88317a4d59c8 100644
+index 2330433745f4..f613f26874c6 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
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -50546,6 +46640,7 @@ index dbb2c6020758..88317a4d59c8 100644
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -50554,23 +46649,18 @@ index dbb2c6020758..88317a4d59c8 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -50589,10 +46679,6 @@ index dbb2c6020758..88317a4d59c8 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -50600,10 +46686,6 @@ index dbb2c6020758..88317a4d59c8 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -50611,7 +46693,6 @@ index dbb2c6020758..88317a4d59c8 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -50619,10 +46700,6 @@ index dbb2c6020758..88317a4d59c8 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -50635,10 +46712,6 @@ index dbb2c6020758..88317a4d59c8 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -50676,7 +46749,7 @@ index dbb2c6020758..88317a4d59c8 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -50734,10 +46807,10 @@ index dbb2c6020758..88317a4d59c8 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -50748,10 +46821,10 @@ index dbb2c6020758..88317a4d59c8 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -50763,18 +46836,10 @@ index dbb2c6020758..88317a4d59c8 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 65ef01a3df9c..c8e2620f015b 100644
+index d5c67b371823..3092974ef246 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -50782,6 +46847,7 @@ index 65ef01a3df9c..c8e2620f015b 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -50790,23 +46856,18 @@ index 65ef01a3df9c..c8e2620f015b 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -50825,10 +46886,6 @@ index 65ef01a3df9c..c8e2620f015b 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -50836,10 +46893,6 @@ index 65ef01a3df9c..c8e2620f015b 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -50847,7 +46900,6 @@ index 65ef01a3df9c..c8e2620f015b 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -50855,10 +46907,6 @@ index 65ef01a3df9c..c8e2620f015b 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -50871,10 +46919,6 @@ index 65ef01a3df9c..c8e2620f015b 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -50905,7 +46949,7 @@ index 65ef01a3df9c..c8e2620f015b 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -50992,18 +47036,10 @@ index 65ef01a3df9c..c8e2620f015b 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 e548e1a7df62..e4de39263699 100644
+index 667b65137559..2f73f17c2555 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -51011,6 +47047,7 @@ index e548e1a7df62..e4de39263699 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -51019,23 +47056,18 @@ index e548e1a7df62..e4de39263699 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -51054,10 +47086,6 @@ index e548e1a7df62..e4de39263699 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -51065,10 +47093,6 @@ index e548e1a7df62..e4de39263699 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -51076,7 +47100,6 @@ index e548e1a7df62..e4de39263699 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -51084,10 +47107,6 @@ index e548e1a7df62..e4de39263699 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -51100,10 +47119,6 @@ index e548e1a7df62..e4de39263699 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -51141,7 +47156,7 @@ index e548e1a7df62..e4de39263699 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -51199,10 +47214,10 @@ index e548e1a7df62..e4de39263699 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -51213,10 +47228,10 @@ index e548e1a7df62..e4de39263699 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -51228,7 +47243,7 @@ index e548e1a7df62..e4de39263699 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 0ffd3ac34d75..b94364f25d2a 100644
+index e1a0baae554c..9b86a297b3bf 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -51239,6 +47254,7 @@ index 0ffd3ac34d75..b94364f25d2a 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -51247,13 +47263,12 @@ index 0ffd3ac34d75..b94364f25d2a 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51288,7 +47303,6 @@ index 0ffd3ac34d75..b94364f25d2a 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -51338,7 +47352,7 @@ index 0ffd3ac34d75..b94364f25d2a 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -51364,7 +47378,7 @@ index 0ffd3ac34d75..b94364f25d2a 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -51406,18 +47420,10 @@ index 0ffd3ac34d75..b94364f25d2a 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 a7a2bbb1a173..b65a6c700d04 100644
+index be4610aa0cf4..95ae3f5c0f93 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -51425,6 +47431,7 @@ index a7a2bbb1a173..b65a6c700d04 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -51433,23 +47440,18 @@ index a7a2bbb1a173..b65a6c700d04 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -51468,10 +47470,6 @@ index a7a2bbb1a173..b65a6c700d04 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -51479,10 +47477,6 @@ index a7a2bbb1a173..b65a6c700d04 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -51490,7 +47484,6 @@ index a7a2bbb1a173..b65a6c700d04 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -51498,10 +47491,6 @@ index a7a2bbb1a173..b65a6c700d04 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -51514,10 +47503,6 @@ index a7a2bbb1a173..b65a6c700d04 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -51555,7 +47540,7 @@ index a7a2bbb1a173..b65a6c700d04 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -51613,10 +47598,10 @@ index a7a2bbb1a173..b65a6c700d04 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -51627,10 +47612,10 @@ index a7a2bbb1a173..b65a6c700d04 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -51642,18 +47627,10 @@ index a7a2bbb1a173..b65a6c700d04 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 5a94688af9e4..57f0eb221338 100644
+index 2e53dee9e378..3d538b54dcb6 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
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -51662,6 +47639,7 @@ index 5a94688af9e4..57f0eb221338 100644
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -51670,23 +47648,18 @@ index 5a94688af9e4..57f0eb221338 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -49,114 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -51705,10 +47678,6 @@ index 5a94688af9e4..57f0eb221338 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -51716,10 +47685,6 @@ index 5a94688af9e4..57f0eb221338 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -51727,7 +47692,6 @@ index 5a94688af9e4..57f0eb221338 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -51735,10 +47699,6 @@ index 5a94688af9e4..57f0eb221338 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -51751,10 +47711,6 @@ index 5a94688af9e4..57f0eb221338 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -51792,7 +47748,7 @@ index 5a94688af9e4..57f0eb221338 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -164,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -51850,10 +47806,10 @@ index 5a94688af9e4..57f0eb221338 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -51864,10 +47820,10 @@ index 5a94688af9e4..57f0eb221338 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -51879,18 +47835,10 @@ index 5a94688af9e4..57f0eb221338 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 2e16a28ccc52..5b1a4dde05c6 100644
+index 0301076b89fd..7fc8cd8541ce 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -51898,6 +47846,7 @@ index 2e16a28ccc52..5b1a4dde05c6 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -51906,23 +47855,18 @@ index 2e16a28ccc52..5b1a4dde05c6 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -51941,10 +47885,6 @@ index 2e16a28ccc52..5b1a4dde05c6 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -51952,10 +47892,6 @@ index 2e16a28ccc52..5b1a4dde05c6 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -51963,7 +47899,6 @@ index 2e16a28ccc52..5b1a4dde05c6 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -51971,10 +47906,6 @@ index 2e16a28ccc52..5b1a4dde05c6 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -51987,10 +47918,6 @@ index 2e16a28ccc52..5b1a4dde05c6 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -52028,7 +47955,7 @@ index 2e16a28ccc52..5b1a4dde05c6 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -52086,10 +48013,10 @@ index 2e16a28ccc52..5b1a4dde05c6 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -52100,10 +48027,10 @@ index 2e16a28ccc52..5b1a4dde05c6 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -52115,7 +48042,7 @@ index 2e16a28ccc52..5b1a4dde05c6 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 d02bbba1b46e..f2650a2d1f47 100644
+index fc03d1e950c9..925eefbff872 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -52126,6 +48053,7 @@ index d02bbba1b46e..f2650a2d1f47 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -52134,13 +48062,12 @@ index d02bbba1b46e..f2650a2d1f47 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52175,7 +48102,6 @@ index d02bbba1b46e..f2650a2d1f47 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -52225,7 +48151,7 @@ index d02bbba1b46e..f2650a2d1f47 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -52251,7 +48177,7 @@ index d02bbba1b46e..f2650a2d1f47 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -52293,18 +48219,10 @@ index d02bbba1b46e..f2650a2d1f47 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 280b95eee7f8..e0519ff9a168 100644
+index 3312eb9b2687..7475d4f5fcc9 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
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -52313,6 +48231,7 @@ index 280b95eee7f8..e0519ff9a168 100644
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -52321,23 +48240,18 @@ index 280b95eee7f8..e0519ff9a168 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -48,114 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -52356,10 +48270,6 @@ index 280b95eee7f8..e0519ff9a168 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -52367,10 +48277,6 @@ index 280b95eee7f8..e0519ff9a168 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -52378,7 +48284,6 @@ index 280b95eee7f8..e0519ff9a168 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -52386,10 +48291,6 @@ index 280b95eee7f8..e0519ff9a168 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -52402,10 +48303,6 @@ index 280b95eee7f8..e0519ff9a168 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -52443,7 +48340,7 @@ index 280b95eee7f8..e0519ff9a168 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -163,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -52501,10 +48398,10 @@ index 280b95eee7f8..e0519ff9a168 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -52515,10 +48412,10 @@ index 280b95eee7f8..e0519ff9a168 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -52530,18 +48427,10 @@ index 280b95eee7f8..e0519ff9a168 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 8e5f14dd12b5..c8fa737a9e36 100644
+index eeb45cb8db7a..767564b38e70 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -52549,6 +48438,7 @@ index 8e5f14dd12b5..c8fa737a9e36 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -52557,23 +48447,18 @@ index 8e5f14dd12b5..c8fa737a9e36 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -52592,10 +48477,6 @@ index 8e5f14dd12b5..c8fa737a9e36 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -52603,10 +48484,6 @@ index 8e5f14dd12b5..c8fa737a9e36 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -52614,7 +48491,6 @@ index 8e5f14dd12b5..c8fa737a9e36 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -52622,10 +48498,6 @@ index 8e5f14dd12b5..c8fa737a9e36 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -52638,10 +48510,6 @@ index 8e5f14dd12b5..c8fa737a9e36 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -52679,7 +48547,7 @@ index 8e5f14dd12b5..c8fa737a9e36 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -52737,10 +48605,10 @@ index 8e5f14dd12b5..c8fa737a9e36 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -52751,10 +48619,10 @@ index 8e5f14dd12b5..c8fa737a9e36 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -52766,18 +48634,10 @@ index 8e5f14dd12b5..c8fa737a9e36 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 69e15a976256..48d3994e3b62 100644
+index 78a1ea36bea8..aef58f171a81 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
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -52786,6 +48646,7 @@ index 69e15a976256..48d3994e3b62 100644
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -52794,23 +48655,18 @@ index 69e15a976256..48d3994e3b62 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -52829,10 +48685,6 @@ index 69e15a976256..48d3994e3b62 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -52840,10 +48692,6 @@ index 69e15a976256..48d3994e3b62 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -52851,7 +48699,6 @@ index 69e15a976256..48d3994e3b62 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -52859,10 +48706,6 @@ index 69e15a976256..48d3994e3b62 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -52875,10 +48718,6 @@ index 69e15a976256..48d3994e3b62 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -52916,7 +48755,7 @@ index 69e15a976256..48d3994e3b62 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -52974,10 +48813,10 @@ index 69e15a976256..48d3994e3b62 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -52988,10 +48827,10 @@ index 69e15a976256..48d3994e3b62 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -53003,18 +48842,10 @@ index 69e15a976256..48d3994e3b62 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 a666f58d28e9..cf694d66ec5c 100644
+index 1de463d8cf15..590703ff90d7 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -53022,6 +48853,7 @@ index a666f58d28e9..cf694d66ec5c 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -53030,23 +48862,18 @@ index a666f58d28e9..cf694d66ec5c 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -53065,10 +48892,6 @@ index a666f58d28e9..cf694d66ec5c 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -53076,10 +48899,6 @@ index a666f58d28e9..cf694d66ec5c 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -53087,7 +48906,6 @@ index a666f58d28e9..cf694d66ec5c 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -53095,10 +48913,6 @@ index a666f58d28e9..cf694d66ec5c 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -53111,10 +48925,6 @@ index a666f58d28e9..cf694d66ec5c 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -53152,7 +48962,7 @@ index a666f58d28e9..cf694d66ec5c 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -53210,10 +49020,10 @@ index a666f58d28e9..cf694d66ec5c 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -53224,10 +49034,10 @@ index a666f58d28e9..cf694d66ec5c 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -53239,7 +49049,7 @@ index a666f58d28e9..cf694d66ec5c 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 ec3430f0ea3b..24afcb8f8ed1 100644
+index 570b4d1a7bb2..77b99ab85ab7 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -53250,6 +49060,7 @@ index ec3430f0ea3b..24afcb8f8ed1 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -53258,13 +49069,12 @@ index ec3430f0ea3b..24afcb8f8ed1 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53303,7 +49113,6 @@ index ec3430f0ea3b..24afcb8f8ed1 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -53360,7 +49169,7 @@ index ec3430f0ea3b..24afcb8f8ed1 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -53386,7 +49195,7 @@ index ec3430f0ea3b..24afcb8f8ed1 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -53428,18 +49237,10 @@ index ec3430f0ea3b..24afcb8f8ed1 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 694be007a960..36f79264c472 100644
+index 73cf1d07a5c3..7b7869c1cc0f 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -53447,6 +49248,7 @@ index 694be007a960..36f79264c472 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -53455,23 +49257,18 @@ index 694be007a960..36f79264c472 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -53490,10 +49287,6 @@ index 694be007a960..36f79264c472 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -53501,10 +49294,6 @@ index 694be007a960..36f79264c472 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -53512,7 +49301,6 @@ index 694be007a960..36f79264c472 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -53520,10 +49308,6 @@ index 694be007a960..36f79264c472 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -53536,10 +49320,6 @@ index 694be007a960..36f79264c472 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -53577,7 +49357,7 @@ index 694be007a960..36f79264c472 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -53635,10 +49415,10 @@ index 694be007a960..36f79264c472 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -53649,10 +49429,10 @@ index 694be007a960..36f79264c472 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -53664,18 +49444,10 @@ index 694be007a960..36f79264c472 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 b737105b2e2c..1470fb8c682a 100644
+index efb1ea3b48bb..784bf34261ff 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -53683,6 +49455,7 @@ index b737105b2e2c..1470fb8c682a 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -53691,23 +49464,18 @@ index b737105b2e2c..1470fb8c682a 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -53726,10 +49494,6 @@ index b737105b2e2c..1470fb8c682a 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -53737,10 +49501,6 @@ index b737105b2e2c..1470fb8c682a 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -53748,7 +49508,6 @@ index b737105b2e2c..1470fb8c682a 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -53756,10 +49515,6 @@ index b737105b2e2c..1470fb8c682a 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -53772,10 +49527,6 @@ index b737105b2e2c..1470fb8c682a 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -53813,7 +49564,7 @@ index b737105b2e2c..1470fb8c682a 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -53871,10 +49622,10 @@ index b737105b2e2c..1470fb8c682a 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -53885,10 +49636,10 @@ index b737105b2e2c..1470fb8c682a 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -53900,18 +49651,10 @@ index b737105b2e2c..1470fb8c682a 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 071308946506..73cbc265e149 100644
+index 4fefa7795aa0..9b8a2d18952e 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -53919,6 +49662,7 @@ index 071308946506..73cbc265e149 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -53927,23 +49671,18 @@ index 071308946506..73cbc265e149 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -53962,10 +49701,6 @@ index 071308946506..73cbc265e149 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -53973,10 +49708,6 @@ index 071308946506..73cbc265e149 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -53984,7 +49715,6 @@ index 071308946506..73cbc265e149 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -53992,10 +49722,6 @@ index 071308946506..73cbc265e149 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -54008,10 +49734,6 @@ index 071308946506..73cbc265e149 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -54042,7 +49764,7 @@ index 071308946506..73cbc265e149 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -54129,18 +49851,10 @@ index 071308946506..73cbc265e149 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 f8aa3e0757df..061f1056932c 100644
+index e5b6ee12a51f..bb89272d797c 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -54148,6 +49862,7 @@ index f8aa3e0757df..061f1056932c 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -54156,23 +49871,18 @@ index f8aa3e0757df..061f1056932c 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -54191,10 +49901,6 @@ index f8aa3e0757df..061f1056932c 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -54202,10 +49908,6 @@ index f8aa3e0757df..061f1056932c 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -54213,7 +49915,6 @@ index f8aa3e0757df..061f1056932c 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -54221,10 +49922,6 @@ index f8aa3e0757df..061f1056932c 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -54237,10 +49934,6 @@ index f8aa3e0757df..061f1056932c 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -54278,7 +49971,7 @@ index f8aa3e0757df..061f1056932c 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -54336,10 +50029,10 @@ index f8aa3e0757df..061f1056932c 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -54350,10 +50043,10 @@ index f8aa3e0757df..061f1056932c 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -54365,7 +50058,7 @@ index f8aa3e0757df..061f1056932c 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 e417e97673c7..76bc962a8aad 100644
+index 4375c115591f..de7a77543eb5 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -54376,6 +50069,7 @@ index e417e97673c7..76bc962a8aad 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -54384,13 +50078,12 @@ index e417e97673c7..76bc962a8aad 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54429,7 +50122,6 @@ index e417e97673c7..76bc962a8aad 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -54479,7 +50171,7 @@ index e417e97673c7..76bc962a8aad 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -54505,7 +50197,7 @@ index e417e97673c7..76bc962a8aad 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -54547,7 +50239,7 @@ index e417e97673c7..76bc962a8aad 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 e18a5bd7f9dc..2be62f51e029 100644
+index 3fb4fa37a59d..a2ec0e64002f 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -54558,6 +50250,7 @@ index e18a5bd7f9dc..2be62f51e029 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -54566,13 +50259,12 @@ index e18a5bd7f9dc..2be62f51e029 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54611,7 +50303,6 @@ index e18a5bd7f9dc..2be62f51e029 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -54661,7 +50352,7 @@ index e18a5bd7f9dc..2be62f51e029 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -54687,7 +50378,7 @@ index e18a5bd7f9dc..2be62f51e029 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -54729,18 +50420,10 @@ index e18a5bd7f9dc..2be62f51e029 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 542765dac9e3..40a3328b5980 100644
+index cf0ed3ecaf31..611573ee4186 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -54748,6 +50431,7 @@ index 542765dac9e3..40a3328b5980 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -54756,23 +50440,18 @@ index 542765dac9e3..40a3328b5980 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -54791,10 +50470,6 @@ index 542765dac9e3..40a3328b5980 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -54802,10 +50477,6 @@ index 542765dac9e3..40a3328b5980 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -54813,7 +50484,6 @@ index 542765dac9e3..40a3328b5980 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -54821,10 +50491,6 @@ index 542765dac9e3..40a3328b5980 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -54837,10 +50503,6 @@ index 542765dac9e3..40a3328b5980 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -54878,7 +50540,7 @@ index 542765dac9e3..40a3328b5980 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -54936,10 +50598,10 @@ index 542765dac9e3..40a3328b5980 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -54950,10 +50612,10 @@ index 542765dac9e3..40a3328b5980 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -54965,7 +50627,7 @@ index 542765dac9e3..40a3328b5980 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 f09fc9513baf..7cc5592dfd1d 100644
+index e0efdff86364..d3eef1484e27 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -54976,6 +50638,7 @@ index f09fc9513baf..7cc5592dfd1d 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -54984,13 +50647,12 @@ index f09fc9513baf..7cc5592dfd1d 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55029,7 +50691,6 @@ index f09fc9513baf..7cc5592dfd1d 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -55079,7 +50740,7 @@ index f09fc9513baf..7cc5592dfd1d 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -55105,7 +50766,7 @@ index f09fc9513baf..7cc5592dfd1d 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -55147,19 +50808,10 @@ index f09fc9513baf..7cc5592dfd1d 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 45291330790b..c6229c6dc7e5 100644
+index 67d0bfcbe14d..9df5c4c6c530 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
-@@ -11,20 +11,30 @@ AllowCompilerWarnings()
-
- CXXFLAGS += [
- "-mavx2",
-- "-mfma"
-+ "-mfma",
-+ "-std=gnu++20"
- ]
-
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -18,13 +18,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -55168,6 +50820,7 @@ index 45291330790b..c6229c6dc7e5 100644
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -55176,23 +50829,18 @@ index 45291330790b..c6229c6dc7e5 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -52,143 +62,9 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,122 +61,9 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -55211,10 +50859,6 @@ index 45291330790b..c6229c6dc7e5 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -55222,10 +50866,6 @@ index 45291330790b..c6229c6dc7e5 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -55233,7 +50873,6 @@ index 45291330790b..c6229c6dc7e5 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_GNU_SOURCE"] = True
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
@@ -55242,10 +50881,6 @@ index 45291330790b..c6229c6dc7e5 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -55258,10 +50893,6 @@ index 45291330790b..c6229c6dc7e5 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -55328,7 +50959,7 @@ index 45291330790b..c6229c6dc7e5 100644
CXXFLAGS += [
"-msse2"
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 44ef3df6cc24..1475e1f30524 100644
+index f7c42e9e9d61..4ebff1919c6f 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -55339,6 +50970,7 @@ index 44ef3df6cc24..1475e1f30524 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -55347,13 +50979,12 @@ index 44ef3df6cc24..1475e1f30524 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55392,7 +51023,6 @@ index 44ef3df6cc24..1475e1f30524 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -55449,7 +51079,7 @@ index 44ef3df6cc24..1475e1f30524 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -55475,7 +51105,7 @@ index 44ef3df6cc24..1475e1f30524 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -55517,18 +51147,10 @@ index 44ef3df6cc24..1475e1f30524 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 b3af82c3d3e6..34d1c7e84cd1 100644
+index 1bdd827e45aa..fde13760ef04 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
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -55537,6 +51159,7 @@ index b3af82c3d3e6..34d1c7e84cd1 100644
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -55545,23 +51168,18 @@ index b3af82c3d3e6..34d1c7e84cd1 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -48,114 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -55580,10 +51198,6 @@ index b3af82c3d3e6..34d1c7e84cd1 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -55591,10 +51205,6 @@ index b3af82c3d3e6..34d1c7e84cd1 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -55602,7 +51212,6 @@ index b3af82c3d3e6..34d1c7e84cd1 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -55610,10 +51219,6 @@ index b3af82c3d3e6..34d1c7e84cd1 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -55626,10 +51231,6 @@ index b3af82c3d3e6..34d1c7e84cd1 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -55667,7 +51268,7 @@ index b3af82c3d3e6..34d1c7e84cd1 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -163,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -55725,10 +51326,10 @@ index b3af82c3d3e6..34d1c7e84cd1 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -55739,10 +51340,10 @@ index b3af82c3d3e6..34d1c7e84cd1 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -55754,18 +51355,10 @@ index b3af82c3d3e6..34d1c7e84cd1 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 4d509a799a63..6ce5e1de874e 100644
+index b159467faa87..3de8cc3c3437 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
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -55774,6 +51367,7 @@ index 4d509a799a63..6ce5e1de874e 100644
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -55782,23 +51376,18 @@ index 4d509a799a63..6ce5e1de874e 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -55817,10 +51406,6 @@ index 4d509a799a63..6ce5e1de874e 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -55828,10 +51413,6 @@ index 4d509a799a63..6ce5e1de874e 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -55839,7 +51420,6 @@ index 4d509a799a63..6ce5e1de874e 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -55847,10 +51427,6 @@ index 4d509a799a63..6ce5e1de874e 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -55863,10 +51439,6 @@ index 4d509a799a63..6ce5e1de874e 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -55904,7 +51476,7 @@ index 4d509a799a63..6ce5e1de874e 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -55962,10 +51534,10 @@ index 4d509a799a63..6ce5e1de874e 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -55976,10 +51548,10 @@ index 4d509a799a63..6ce5e1de874e 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -55991,18 +51563,10 @@ index 4d509a799a63..6ce5e1de874e 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 383103815df1..e6d34f2e9963 100644
+index 88f39d6c59ae..1c7395007405 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -56010,6 +51574,7 @@ index 383103815df1..e6d34f2e9963 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -56018,23 +51583,18 @@ index 383103815df1..e6d34f2e9963 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -56053,10 +51613,6 @@ index 383103815df1..e6d34f2e9963 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -56064,10 +51620,6 @@ index 383103815df1..e6d34f2e9963 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -56075,7 +51627,6 @@ index 383103815df1..e6d34f2e9963 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -56083,10 +51634,6 @@ index 383103815df1..e6d34f2e9963 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -56099,10 +51646,6 @@ index 383103815df1..e6d34f2e9963 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -56140,7 +51683,7 @@ index 383103815df1..e6d34f2e9963 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -56198,10 +51741,10 @@ index 383103815df1..e6d34f2e9963 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -56212,10 +51755,10 @@ index 383103815df1..e6d34f2e9963 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -56227,18 +51770,10 @@ index 383103815df1..e6d34f2e9963 100644
Library("vad_wrapper_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 98d6b29cc08a..b7dde8b2de94 100644
+index 9cf92bd2a934..998b3c95ab71 100644
--- third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -56247,6 +51782,7 @@ index 98d6b29cc08a..b7dde8b2de94 100644
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -56255,23 +51791,18 @@ index 98d6b29cc08a..b7dde8b2de94 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -56290,10 +51821,6 @@ index 98d6b29cc08a..b7dde8b2de94 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -56301,10 +51828,6 @@ index 98d6b29cc08a..b7dde8b2de94 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -56312,7 +51835,6 @@ index 98d6b29cc08a..b7dde8b2de94 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -56320,10 +51842,6 @@ index 98d6b29cc08a..b7dde8b2de94 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -56336,10 +51854,6 @@ index 98d6b29cc08a..b7dde8b2de94 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -56377,7 +51891,7 @@ index 98d6b29cc08a..b7dde8b2de94 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -56435,10 +51949,10 @@ index 98d6b29cc08a..b7dde8b2de94 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -56449,10 +51963,10 @@ index 98d6b29cc08a..b7dde8b2de94 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -56464,18 +51978,10 @@ index 98d6b29cc08a..b7dde8b2de94 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 058ad74950dd..977deec4d7f4 100644
+index 17ed3d672a03..1c1b8d4143d8 100644
--- third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -56484,6 +51990,7 @@ index 058ad74950dd..977deec4d7f4 100644
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -56492,23 +51999,18 @@ index 058ad74950dd..977deec4d7f4 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -49,114 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -56527,10 +52029,6 @@ index 058ad74950dd..977deec4d7f4 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -56538,10 +52036,6 @@ index 058ad74950dd..977deec4d7f4 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -56549,7 +52043,6 @@ index 058ad74950dd..977deec4d7f4 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -56557,10 +52050,6 @@ index 058ad74950dd..977deec4d7f4 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -56573,10 +52062,6 @@ index 058ad74950dd..977deec4d7f4 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -56614,7 +52099,7 @@ index 058ad74950dd..977deec4d7f4 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -164,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -56672,10 +52157,10 @@ index 058ad74950dd..977deec4d7f4 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -56686,10 +52171,10 @@ index 058ad74950dd..977deec4d7f4 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -56701,18 +52186,10 @@ index 058ad74950dd..977deec4d7f4 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 23ffb08d2621..c014bab9b892 100644
+index c1c5e0b27d94..b56d3e9d131c 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -56720,6 +52197,7 @@ index 23ffb08d2621..c014bab9b892 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -56728,23 +52206,18 @@ index 23ffb08d2621..c014bab9b892 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -56763,10 +52236,6 @@ index 23ffb08d2621..c014bab9b892 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -56774,10 +52243,6 @@ index 23ffb08d2621..c014bab9b892 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -56785,7 +52250,6 @@ index 23ffb08d2621..c014bab9b892 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -56793,10 +52257,6 @@ index 23ffb08d2621..c014bab9b892 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -56809,10 +52269,6 @@ index 23ffb08d2621..c014bab9b892 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -56850,7 +52306,7 @@ index 23ffb08d2621..c014bab9b892 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -56908,10 +52364,10 @@ index 23ffb08d2621..c014bab9b892 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -56922,10 +52378,10 @@ index 23ffb08d2621..c014bab9b892 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -56937,7 +52393,7 @@ index 23ffb08d2621..c014bab9b892 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 6d2602568141..379149997075 100644
+index 1a41d352a6b7..c2d5f48fe19f 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -56948,6 +52404,7 @@ index 6d2602568141..379149997075 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -56956,13 +52413,12 @@ index 6d2602568141..379149997075 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57001,7 +52457,6 @@ index 6d2602568141..379149997075 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -57058,7 +52513,7 @@ index 6d2602568141..379149997075 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -57084,7 +52539,7 @@ index 6d2602568141..379149997075 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -57126,18 +52581,10 @@ index 6d2602568141..379149997075 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 92550aa6d0d4..a2ffd5dd447a 100644
+index cbf16e2d8d5a..7204f516a50d 100644
--- third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -57146,6 +52593,7 @@ index 92550aa6d0d4..a2ffd5dd447a 100644
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -57154,23 +52602,18 @@ index 92550aa6d0d4..a2ffd5dd447a 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -52,114 +65,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,93 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -57189,10 +52632,6 @@ index 92550aa6d0d4..a2ffd5dd447a 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -57200,10 +52639,6 @@ index 92550aa6d0d4..a2ffd5dd447a 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -57211,7 +52646,6 @@ index 92550aa6d0d4..a2ffd5dd447a 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -57219,10 +52653,6 @@ index 92550aa6d0d4..a2ffd5dd447a 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -57235,10 +52665,6 @@ index 92550aa6d0d4..a2ffd5dd447a 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -57276,7 +52702,7 @@ index 92550aa6d0d4..a2ffd5dd447a 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -167,82 +73,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -146,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -57334,10 +52760,10 @@ index 92550aa6d0d4..a2ffd5dd447a 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -57348,10 +52774,10 @@ index 92550aa6d0d4..a2ffd5dd447a 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -57363,18 +52789,10 @@ index 92550aa6d0d4..a2ffd5dd447a 100644
Library("audio_processing_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 3dbfcd5a6f9f..a08fb28c3289 100644
+index 566fa702e086..8df1dc59bb19 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -57382,6 +52800,7 @@ index 3dbfcd5a6f9f..a08fb28c3289 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -57390,23 +52809,18 @@ index 3dbfcd5a6f9f..a08fb28c3289 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -57425,10 +52839,6 @@ index 3dbfcd5a6f9f..a08fb28c3289 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -57436,10 +52846,6 @@ index 3dbfcd5a6f9f..a08fb28c3289 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -57447,7 +52853,6 @@ index 3dbfcd5a6f9f..a08fb28c3289 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -57455,10 +52860,6 @@ index 3dbfcd5a6f9f..a08fb28c3289 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -57471,10 +52872,6 @@ index 3dbfcd5a6f9f..a08fb28c3289 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -57512,7 +52909,7 @@ index 3dbfcd5a6f9f..a08fb28c3289 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -57570,10 +52967,10 @@ index 3dbfcd5a6f9f..a08fb28c3289 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -57584,10 +52981,10 @@ index 3dbfcd5a6f9f..a08fb28c3289 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -57599,18 +52996,10 @@ index 3dbfcd5a6f9f..a08fb28c3289 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 24d24a7b0a63..507db98ee882 100644
+index 52e13f77d65e..2a4fd4b2f230 100644
--- third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -57619,6 +53008,7 @@ index 24d24a7b0a63..507db98ee882 100644
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -57627,23 +53017,18 @@ index 24d24a7b0a63..507db98ee882 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -57662,10 +53047,6 @@ index 24d24a7b0a63..507db98ee882 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -57673,10 +53054,6 @@ index 24d24a7b0a63..507db98ee882 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -57684,7 +53061,6 @@ index 24d24a7b0a63..507db98ee882 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -57692,10 +53068,6 @@ index 24d24a7b0a63..507db98ee882 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -57708,10 +53080,6 @@ index 24d24a7b0a63..507db98ee882 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -57749,7 +53117,7 @@ index 24d24a7b0a63..507db98ee882 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -57807,10 +53175,10 @@ index 24d24a7b0a63..507db98ee882 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -57821,10 +53189,10 @@ index 24d24a7b0a63..507db98ee882 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -57836,18 +53204,10 @@ index 24d24a7b0a63..507db98ee882 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 4090a31bc00c..399836f5bd82 100644
+index a1c9ddba74f3..0f0e8130fc1d 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -57855,6 +53215,7 @@ index 4090a31bc00c..399836f5bd82 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -57863,23 +53224,18 @@ index 4090a31bc00c..399836f5bd82 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -57898,10 +53254,6 @@ index 4090a31bc00c..399836f5bd82 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -57909,10 +53261,6 @@ index 4090a31bc00c..399836f5bd82 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -57920,7 +53268,6 @@ index 4090a31bc00c..399836f5bd82 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -57928,10 +53275,6 @@ index 4090a31bc00c..399836f5bd82 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -57944,10 +53287,6 @@ index 4090a31bc00c..399836f5bd82 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -57985,7 +53324,7 @@ index 4090a31bc00c..399836f5bd82 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -58043,10 +53382,10 @@ index 4090a31bc00c..399836f5bd82 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -58057,10 +53396,10 @@ index 4090a31bc00c..399836f5bd82 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -58072,18 +53411,10 @@ index 4090a31bc00c..399836f5bd82 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 c6b493c74573..ab6efa463be2 100644
+index 913766a7301e..d7e4306b8748 100644
--- third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -58092,6 +53423,7 @@ index c6b493c74573..ab6efa463be2 100644
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -58100,23 +53432,18 @@ index c6b493c74573..ab6efa463be2 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -59,114 +72,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -59,93 +68,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -58135,10 +53462,6 @@ index c6b493c74573..ab6efa463be2 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -58146,10 +53469,6 @@ index c6b493c74573..ab6efa463be2 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -58157,7 +53476,6 @@ index c6b493c74573..ab6efa463be2 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -58165,10 +53483,6 @@ index c6b493c74573..ab6efa463be2 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -58181,10 +53495,6 @@ index c6b493c74573..ab6efa463be2 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -58222,7 +53532,7 @@ index c6b493c74573..ab6efa463be2 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -174,82 +80,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -153,82 +76,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -58280,10 +53590,10 @@ index c6b493c74573..ab6efa463be2 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -58294,10 +53604,10 @@ index c6b493c74573..ab6efa463be2 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -58309,18 +53619,10 @@ index c6b493c74573..ab6efa463be2 100644
Library("ns_gn")
diff --git third_party/libwebrtc/modules/audio_processing/post_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/post_filter_gn/moz.build
-index 6677bc0c5c90..8c43bca031b3 100644
+index adbf42b91139..595a0ad0d37c 100644
--- third_party/libwebrtc/modules/audio_processing/post_filter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/post_filter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -58328,6 +53630,7 @@ index 6677bc0c5c90..8c43bca031b3 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -58336,23 +53639,18 @@ index 6677bc0c5c90..8c43bca031b3 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -58371,10 +53669,6 @@ index 6677bc0c5c90..8c43bca031b3 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -58382,10 +53676,6 @@ index 6677bc0c5c90..8c43bca031b3 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -58393,7 +53683,6 @@ index 6677bc0c5c90..8c43bca031b3 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -58401,10 +53690,6 @@ index 6677bc0c5c90..8c43bca031b3 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -58417,10 +53702,6 @@ index 6677bc0c5c90..8c43bca031b3 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -58458,7 +53739,7 @@ index 6677bc0c5c90..8c43bca031b3 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -58516,10 +53797,10 @@ index 6677bc0c5c90..8c43bca031b3 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -58530,10 +53811,10 @@ index 6677bc0c5c90..8c43bca031b3 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -58545,18 +53826,10 @@ index 6677bc0c5c90..8c43bca031b3 100644
Library("post_filter_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 3276b98346a3..7c8a2be7ff49 100644
+index bcdec468bd11..2c78ef2b8605 100644
--- third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -58564,6 +53837,7 @@ index 3276b98346a3..7c8a2be7ff49 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -58572,23 +53846,18 @@ index 3276b98346a3..7c8a2be7ff49 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -58607,10 +53876,6 @@ index 3276b98346a3..7c8a2be7ff49 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -58618,10 +53883,6 @@ index 3276b98346a3..7c8a2be7ff49 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -58629,7 +53890,6 @@ index 3276b98346a3..7c8a2be7ff49 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -58637,10 +53897,6 @@ index 3276b98346a3..7c8a2be7ff49 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -58653,10 +53909,6 @@ index 3276b98346a3..7c8a2be7ff49 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -58687,7 +53939,7 @@ index 3276b98346a3..7c8a2be7ff49 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -58774,18 +54026,10 @@ index 3276b98346a3..7c8a2be7ff49 100644
Library("rms_level_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 af67cfe4ed78..480ce2321da9 100644
+index d0c4e5e064dc..159e9cf582d7 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -58793,6 +54037,7 @@ index af67cfe4ed78..480ce2321da9 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -58801,23 +54046,18 @@ index af67cfe4ed78..480ce2321da9 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -58836,10 +54076,6 @@ index af67cfe4ed78..480ce2321da9 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -58847,10 +54083,6 @@ index af67cfe4ed78..480ce2321da9 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -58858,7 +54090,6 @@ index af67cfe4ed78..480ce2321da9 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -58866,10 +54097,6 @@ index af67cfe4ed78..480ce2321da9 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -58882,10 +54109,6 @@ index af67cfe4ed78..480ce2321da9 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -58916,7 +54139,7 @@ index af67cfe4ed78..480ce2321da9 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -59003,18 +54226,10 @@ index af67cfe4ed78..480ce2321da9 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 d5df1c79df2a..433da84b049f 100644
+index e56b8a7cc52c..a037bee529b4 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -59022,6 +54237,7 @@ index d5df1c79df2a..433da84b049f 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -59030,23 +54246,18 @@ index d5df1c79df2a..433da84b049f 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,107 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -59065,10 +54276,6 @@ index d5df1c79df2a..433da84b049f 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -59076,10 +54283,6 @@ index d5df1c79df2a..433da84b049f 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -59087,7 +54290,6 @@ index d5df1c79df2a..433da84b049f 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -59095,10 +54297,6 @@ index d5df1c79df2a..433da84b049f 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -59111,10 +54309,6 @@ index d5df1c79df2a..433da84b049f 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -59145,7 +54339,7 @@ index d5df1c79df2a..433da84b049f 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -155,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -59232,18 +54426,10 @@ index d5df1c79df2a..433da84b049f 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 2541f6fc8210..d61f972b1321 100644
+index 4d177ba51e76..1352dcf9dd77 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -59251,6 +54437,7 @@ index 2541f6fc8210..d61f972b1321 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -59259,23 +54446,18 @@ index 2541f6fc8210..d61f972b1321 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -59294,10 +54476,6 @@ index 2541f6fc8210..d61f972b1321 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -59305,10 +54483,6 @@ index 2541f6fc8210..d61f972b1321 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -59316,7 +54490,6 @@ index 2541f6fc8210..d61f972b1321 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -59324,10 +54497,6 @@ index 2541f6fc8210..d61f972b1321 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -59340,10 +54509,6 @@ index 2541f6fc8210..d61f972b1321 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -59374,7 +54539,7 @@ index 2541f6fc8210..d61f972b1321 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -59461,18 +54626,10 @@ index 2541f6fc8210..d61f972b1321 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 1ceb37d542e2..0f4bb1e12367 100644
+index b75e258645f5..47eebf564575 100644
--- third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -59480,6 +54637,7 @@ index 1ceb37d542e2..0f4bb1e12367 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -59488,23 +54646,18 @@ index 1ceb37d542e2..0f4bb1e12367 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -53,114 +66,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,93 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -59523,10 +54676,6 @@ index 1ceb37d542e2..0f4bb1e12367 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -59534,10 +54683,6 @@ index 1ceb37d542e2..0f4bb1e12367 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -59545,7 +54690,6 @@ index 1ceb37d542e2..0f4bb1e12367 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -59553,10 +54697,6 @@ index 1ceb37d542e2..0f4bb1e12367 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -59569,10 +54709,6 @@ index 1ceb37d542e2..0f4bb1e12367 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -59610,7 +54746,7 @@ index 1ceb37d542e2..0f4bb1e12367 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -168,82 +74,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -147,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -59668,10 +54804,10 @@ index 1ceb37d542e2..0f4bb1e12367 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -59682,10 +54818,10 @@ index 1ceb37d542e2..0f4bb1e12367 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -59697,18 +54833,10 @@ index 1ceb37d542e2..0f4bb1e12367 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 8c869f510632..904649b32ae0 100644
+index 3c4421782f08..3db34e302b65 100644
--- third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -59716,6 +54844,7 @@ index 8c869f510632..904649b32ae0 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -59724,23 +54853,18 @@ index 8c869f510632..904649b32ae0 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,115 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -59760,10 +54884,6 @@ index 8c869f510632..904649b32ae0 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -59771,10 +54891,6 @@ index 8c869f510632..904649b32ae0 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -59782,7 +54898,6 @@ index 8c869f510632..904649b32ae0 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -59790,10 +54905,6 @@ index 8c869f510632..904649b32ae0 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -59806,10 +54917,6 @@ index 8c869f510632..904649b32ae0 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -59847,7 +54954,7 @@ index 8c869f510632..904649b32ae0 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -163,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -59905,10 +55012,10 @@ index 8c869f510632..904649b32ae0 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -59919,10 +55026,10 @@ index 8c869f510632..904649b32ae0 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -59934,18 +55041,10 @@ index 8c869f510632..904649b32ae0 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 cd003ec3869f..5a485118c983 100644
+index c3eac770d4a4..44e65e3af3dd 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -59953,6 +55052,7 @@ index cd003ec3869f..5a485118c983 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -59961,23 +55061,18 @@ index cd003ec3869f..5a485118c983 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -59996,10 +55091,6 @@ index cd003ec3869f..5a485118c983 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -60007,10 +55098,6 @@ index cd003ec3869f..5a485118c983 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -60018,7 +55105,6 @@ index cd003ec3869f..5a485118c983 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -60026,10 +55112,6 @@ index cd003ec3869f..5a485118c983 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -60042,10 +55124,6 @@ index cd003ec3869f..5a485118c983 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -60083,7 +55161,7 @@ index cd003ec3869f..5a485118c983 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -60141,10 +55219,10 @@ index cd003ec3869f..5a485118c983 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -60155,10 +55233,10 @@ index cd003ec3869f..5a485118c983 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -60170,18 +55248,10 @@ index cd003ec3869f..5a485118c983 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 e6b717e83cff..d8c2ef06bccb 100644
+index 21fff249f2b7..6535a0ec9e81 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -60189,6 +55259,7 @@ index e6b717e83cff..d8c2ef06bccb 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -60197,23 +55268,18 @@ index e6b717e83cff..d8c2ef06bccb 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,115 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -60233,10 +55299,6 @@ index e6b717e83cff..d8c2ef06bccb 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -60244,10 +55306,6 @@ index e6b717e83cff..d8c2ef06bccb 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -60255,7 +55313,6 @@ index e6b717e83cff..d8c2ef06bccb 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -60263,10 +55320,6 @@ index e6b717e83cff..d8c2ef06bccb 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -60279,10 +55332,6 @@ index e6b717e83cff..d8c2ef06bccb 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -60320,7 +55369,7 @@ index e6b717e83cff..d8c2ef06bccb 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -163,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -60378,10 +55427,10 @@ index e6b717e83cff..d8c2ef06bccb 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -60392,10 +55441,10 @@ index e6b717e83cff..d8c2ef06bccb 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -60407,18 +55456,10 @@ index e6b717e83cff..d8c2ef06bccb 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 160eccc1f99d..28c377fc9c57 100644
+index a77055ccdac9..9475b31f9aaa 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -60426,6 +55467,7 @@ index 160eccc1f99d..28c377fc9c57 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -60434,23 +55476,18 @@ index 160eccc1f99d..28c377fc9c57 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -51,114 +64,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,93 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -60469,10 +55506,6 @@ index 160eccc1f99d..28c377fc9c57 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -60480,10 +55513,6 @@ index 160eccc1f99d..28c377fc9c57 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -60491,7 +55520,6 @@ index 160eccc1f99d..28c377fc9c57 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -60499,10 +55527,6 @@ index 160eccc1f99d..28c377fc9c57 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -60515,10 +55539,6 @@ index 160eccc1f99d..28c377fc9c57 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -60556,7 +55576,7 @@ index 160eccc1f99d..28c377fc9c57 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -166,82 +72,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -145,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -60614,10 +55634,10 @@ index 160eccc1f99d..28c377fc9c57 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -60628,10 +55648,10 @@ index 160eccc1f99d..28c377fc9c57 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -60643,18 +55663,10 @@ index 160eccc1f99d..28c377fc9c57 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 3911e8ff1001..948acef63e79 100644
+index 0a9814333b31..212b0ad6dd21 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -60662,6 +55674,7 @@ index 3911e8ff1001..948acef63e79 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -60670,23 +55683,18 @@ index 3911e8ff1001..948acef63e79 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -60706,10 +55714,6 @@ index 3911e8ff1001..948acef63e79 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -60717,10 +55721,6 @@ index 3911e8ff1001..948acef63e79 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -60728,7 +55728,6 @@ index 3911e8ff1001..948acef63e79 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -60736,10 +55735,6 @@ index 3911e8ff1001..948acef63e79 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -60752,10 +55747,6 @@ index 3911e8ff1001..948acef63e79 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -60793,7 +55784,7 @@ index 3911e8ff1001..948acef63e79 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -60851,10 +55842,10 @@ index 3911e8ff1001..948acef63e79 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -60865,10 +55856,10 @@ index 3911e8ff1001..948acef63e79 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -60880,18 +55871,10 @@ index 3911e8ff1001..948acef63e79 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 44c809dfedd9..5d7411ee9700 100644
+index aac6b3bd8559..837ba3ec6c9f 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -60899,6 +55882,7 @@ index 44c809dfedd9..5d7411ee9700 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -60907,23 +55891,18 @@ index 44c809dfedd9..5d7411ee9700 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -60942,10 +55921,6 @@ index 44c809dfedd9..5d7411ee9700 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -60953,10 +55928,6 @@ index 44c809dfedd9..5d7411ee9700 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -60964,7 +55935,6 @@ index 44c809dfedd9..5d7411ee9700 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -60972,10 +55942,6 @@ index 44c809dfedd9..5d7411ee9700 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -60988,10 +55954,6 @@ index 44c809dfedd9..5d7411ee9700 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -61022,7 +55984,7 @@ index 44c809dfedd9..5d7411ee9700 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -61109,18 +56071,10 @@ index 44c809dfedd9..5d7411ee9700 100644
Library("link_capacity_estimator_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 baed3863d12f..a3655b8f658d 100644
+index 966c3862293a..f458c2372ba0 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -61128,6 +56082,7 @@ index baed3863d12f..a3655b8f658d 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -61136,23 +56091,18 @@ index baed3863d12f..a3655b8f658d 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -61171,10 +56121,6 @@ index baed3863d12f..a3655b8f658d 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -61182,10 +56128,6 @@ index baed3863d12f..a3655b8f658d 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -61193,7 +56135,6 @@ index baed3863d12f..a3655b8f658d 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -61201,10 +56142,6 @@ index baed3863d12f..a3655b8f658d 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -61217,10 +56154,6 @@ index baed3863d12f..a3655b8f658d 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -61258,7 +56191,7 @@ index baed3863d12f..a3655b8f658d 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -61316,10 +56249,10 @@ index baed3863d12f..a3655b8f658d 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -61330,10 +56263,10 @@ index baed3863d12f..a3655b8f658d 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -61345,18 +56278,10 @@ index baed3863d12f..a3655b8f658d 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 701eb9f46814..d6bdf50e6195 100644
+index ff8f2a440a1f..063cb6f8f88d 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -61364,6 +56289,7 @@ index 701eb9f46814..d6bdf50e6195 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -61372,23 +56298,18 @@ index 701eb9f46814..d6bdf50e6195 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -61407,10 +56328,6 @@ index 701eb9f46814..d6bdf50e6195 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -61418,10 +56335,6 @@ index 701eb9f46814..d6bdf50e6195 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -61429,7 +56342,6 @@ index 701eb9f46814..d6bdf50e6195 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -61437,10 +56349,6 @@ index 701eb9f46814..d6bdf50e6195 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -61453,10 +56361,6 @@ index 701eb9f46814..d6bdf50e6195 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -61494,7 +56398,7 @@ index 701eb9f46814..d6bdf50e6195 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -61552,10 +56456,10 @@ index 701eb9f46814..d6bdf50e6195 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -61566,10 +56470,10 @@ index 701eb9f46814..d6bdf50e6195 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -61581,18 +56485,10 @@ index 701eb9f46814..d6bdf50e6195 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 f31df05e9cc1..8f9781707754 100644
+index 50844ee8832c..37b71e85844f 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -61600,6 +56496,7 @@ index f31df05e9cc1..8f9781707754 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -61608,23 +56505,18 @@ index f31df05e9cc1..8f9781707754 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -61643,10 +56535,6 @@ index f31df05e9cc1..8f9781707754 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -61654,10 +56542,6 @@ index f31df05e9cc1..8f9781707754 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -61665,7 +56549,6 @@ index f31df05e9cc1..8f9781707754 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -61673,10 +56556,6 @@ index f31df05e9cc1..8f9781707754 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -61689,10 +56568,6 @@ index f31df05e9cc1..8f9781707754 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -61730,7 +56605,7 @@ index f31df05e9cc1..8f9781707754 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -61788,10 +56663,10 @@ index f31df05e9cc1..8f9781707754 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -61802,10 +56677,10 @@ index f31df05e9cc1..8f9781707754 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -61817,18 +56692,10 @@ index f31df05e9cc1..8f9781707754 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 43e7fdcca440..2e6b77ca422d 100644
+index fc3f36198875..162fbab4195f 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -61836,6 +56703,7 @@ index 43e7fdcca440..2e6b77ca422d 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -61844,23 +56712,18 @@ index 43e7fdcca440..2e6b77ca422d 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -61879,10 +56742,6 @@ index 43e7fdcca440..2e6b77ca422d 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -61890,10 +56749,6 @@ index 43e7fdcca440..2e6b77ca422d 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -61901,7 +56756,6 @@ index 43e7fdcca440..2e6b77ca422d 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -61909,10 +56763,6 @@ index 43e7fdcca440..2e6b77ca422d 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -61925,10 +56775,6 @@ index 43e7fdcca440..2e6b77ca422d 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -61966,7 +56812,7 @@ index 43e7fdcca440..2e6b77ca422d 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -62024,10 +56870,10 @@ index 43e7fdcca440..2e6b77ca422d 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -62038,10 +56884,10 @@ index 43e7fdcca440..2e6b77ca422d 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -62053,18 +56899,10 @@ index 43e7fdcca440..2e6b77ca422d 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 03eba1c22a16..10b8dd972fbe 100644
+index 2360a15491dc..5f1a2ac7442a 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -62072,6 +56910,7 @@ index 03eba1c22a16..10b8dd972fbe 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -62080,23 +56919,18 @@ index 03eba1c22a16..10b8dd972fbe 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -62116,10 +56950,6 @@ index 03eba1c22a16..10b8dd972fbe 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -62127,10 +56957,6 @@ index 03eba1c22a16..10b8dd972fbe 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -62138,7 +56964,6 @@ index 03eba1c22a16..10b8dd972fbe 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -62146,10 +56971,6 @@ index 03eba1c22a16..10b8dd972fbe 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -62162,10 +56983,6 @@ index 03eba1c22a16..10b8dd972fbe 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -62203,7 +57020,7 @@ index 03eba1c22a16..10b8dd972fbe 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -62261,10 +57078,10 @@ index 03eba1c22a16..10b8dd972fbe 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -62275,10 +57092,10 @@ index 03eba1c22a16..10b8dd972fbe 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -62290,18 +57107,10 @@ index 03eba1c22a16..10b8dd972fbe 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 2f3d51d2d0f3..ca791c4ffb1e 100644
+index d29224be7452..f3bcafd8ad85 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -62309,6 +57118,7 @@ index 2f3d51d2d0f3..ca791c4ffb1e 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -62317,23 +57127,18 @@ index 2f3d51d2d0f3..ca791c4ffb1e 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -62352,10 +57157,6 @@ index 2f3d51d2d0f3..ca791c4ffb1e 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -62363,10 +57164,6 @@ index 2f3d51d2d0f3..ca791c4ffb1e 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -62374,7 +57171,6 @@ index 2f3d51d2d0f3..ca791c4ffb1e 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -62382,10 +57178,6 @@ index 2f3d51d2d0f3..ca791c4ffb1e 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -62398,10 +57190,6 @@ index 2f3d51d2d0f3..ca791c4ffb1e 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -62439,7 +57227,7 @@ index 2f3d51d2d0f3..ca791c4ffb1e 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -62497,10 +57285,10 @@ index 2f3d51d2d0f3..ca791c4ffb1e 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -62511,10 +57299,10 @@ index 2f3d51d2d0f3..ca791c4ffb1e 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -62526,18 +57314,10 @@ index 2f3d51d2d0f3..ca791c4ffb1e 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 5ac5f9dc2618..6a80673f02c5 100644
+index e7579297f794..3a83dde9190a 100644
--- third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
+++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -62546,6 +57326,7 @@ index 5ac5f9dc2618..6a80673f02c5 100644
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -62554,13 +57335,12 @@ index 5ac5f9dc2618..6a80673f02c5 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,113 +60,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,102 +56,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62568,8 +57348,7 @@ index 5ac5f9dc2618..6a80673f02c5 100644
-if CONFIG["OS_TARGET"] == "Darwin":
-
- CXXFLAGS += [
-- "-msse2",
-- "-std=gnu++20"
+- "-msse2"
- ]
-
- DEFINES["WEBRTC_MAC"] = True
@@ -62579,10 +57358,6 @@ index 5ac5f9dc2618..6a80673f02c5 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -62590,7 +57365,6 @@ index 5ac5f9dc2618..6a80673f02c5 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_GNU_SOURCE"] = True
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
@@ -62600,8 +57374,7 @@ index 5ac5f9dc2618..6a80673f02c5 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- CXXFLAGS += [
-- "-msse2",
-- "-std=gnu++20"
+- "-msse2"
- ]
-
- DEFINES["USE_GLIB"] = "1"
@@ -62616,10 +57389,6 @@ index 5ac5f9dc2618..6a80673f02c5 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -62649,12 +57418,12 @@ index 5ac5f9dc2618..6a80673f02c5 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
- DEFINES["_DEBUG"] = True
-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["_DEBUG"] = True
@@ -62677,18 +57446,10 @@ index 5ac5f9dc2618..6a80673f02c5 100644
CXXFLAGS += [
"-msse2"
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 89bec9b845b0..cdb54c132cb5 100644
+index 9e856db8df87..78652d03cb96 100644
--- third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
+++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
-@@ -22,16 +22,29 @@ if not CONFIG["MOZ_SYSTEM_PIPEWIRE"]:
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -26,12 +26,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -62696,6 +57457,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -62704,23 +57466,18 @@ index 89bec9b845b0..cdb54c132cb5 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -84,197 +97,14 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -84,180 +93,14 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -62735,10 +57492,6 @@ index 89bec9b845b0..cdb54c132cb5 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -62746,7 +57499,6 @@ index 89bec9b845b0..cdb54c132cb5 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -62763,10 +57515,6 @@ index 89bec9b845b0..cdb54c132cb5 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -62808,10 +57556,6 @@ index 89bec9b845b0..cdb54c132cb5 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -62910,7 +57654,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
LOCAL_INCLUDES += [
"/third_party/libepoxy/libepoxy/include/",
-@@ -282,7 +112,8 @@ if CONFIG["TARGET_CPU"] == "arm":
+@@ -265,7 +108,8 @@ if CONFIG["TARGET_CPU"] == "arm":
]
SOURCES += [
@@ -62920,7 +57664,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
]
UNIFIED_SOURCES += [
-@@ -292,34 +123,9 @@ if CONFIG["TARGET_CPU"] == "arm":
+@@ -275,34 +119,9 @@ if CONFIG["TARGET_CPU"] == "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",
@@ -62958,7 +57702,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
]
if CONFIG["TARGET_CPU"] == "mips32":
-@@ -327,7 +133,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -310,7 +129,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
DEFINES["MIPS32_LE"] = True
DEFINES["MIPS_FPU_LE"] = True
DEFINES["WEBRTC_USE_PIPEWIRE"] = True
@@ -62966,7 +57710,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
LOCAL_INCLUDES += [
"/third_party/libepoxy/libepoxy/include/",
-@@ -335,7 +140,8 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -318,7 +136,8 @@ if CONFIG["TARGET_CPU"] == "mips32":
]
SOURCES += [
@@ -62976,7 +57720,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
]
UNIFIED_SOURCES += [
-@@ -345,13 +151,14 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -328,13 +147,14 @@ if CONFIG["TARGET_CPU"] == "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",
@@ -62993,7 +57737,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
LOCAL_INCLUDES += [
"/third_party/libepoxy/libepoxy/include/",
-@@ -359,7 +166,8 @@ if CONFIG["TARGET_CPU"] == "mips64":
+@@ -342,7 +162,8 @@ if CONFIG["TARGET_CPU"] == "mips64":
]
SOURCES += [
@@ -63003,7 +57747,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
]
UNIFIED_SOURCES += [
-@@ -369,117 +177,19 @@ if CONFIG["TARGET_CPU"] == "mips64":
+@@ -352,117 +173,19 @@ if CONFIG["TARGET_CPU"] == "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",
@@ -63125,7 +57869,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
LOCAL_INCLUDES += [
"/third_party/libepoxy/libepoxy/include/",
-@@ -487,7 +197,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -470,7 +193,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
]
SOURCES += [
@@ -63135,7 +57879,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
]
UNIFIED_SOURCES += [
-@@ -497,13 +208,15 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -480,13 +204,15 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
"/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",
@@ -63154,7 +57898,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
LOCAL_INCLUDES += [
"/third_party/libepoxy/libepoxy/include/",
-@@ -511,7 +224,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+@@ -494,7 +220,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
]
SOURCES += [
@@ -63164,7 +57908,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
]
UNIFIED_SOURCES += [
-@@ -521,10 +235,12 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+@@ -504,10 +231,12 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
"/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",
@@ -63179,7 +57923,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
DEFINES["WEBRTC_USE_X11"] = True
-@@ -550,134 +266,61 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGE
+@@ -533,134 +262,61 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGE
"/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc"
]
@@ -63346,7 +58090,7 @@ index 89bec9b845b0..cdb54c132cb5 100644
Library("desktop_capture_gn")
diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build
deleted file mode 100644
-index 8d73e6328be6..000000000000
+index e27c2d700063..000000000000
--- third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build
+++ /dev/null
@@ -1,81 +0,0 @@
@@ -63370,13 +58114,13 @@ index 8d73e6328be6..000000000000
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
-DEFINES["WEBRTC_MAC"] = True
-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
-DEFINES["WEBRTC_POSIX"] = True
-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-DEFINES["__STDC_CONSTANT_MACROS"] = True
-DEFINES["__STDC_FORMAT_MACROS"] = True
-
@@ -63432,18 +58176,10 @@ index 8d73e6328be6..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 08c499404beb..e4eb5944e021 100644
+index 9d966c83f568..fe4c0e8d1fb2 100644
--- third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
+++ third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -63451,6 +58187,7 @@ index 08c499404beb..e4eb5944e021 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -63459,23 +58196,18 @@ index 08c499404beb..e4eb5944e021 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -52,85 +65,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,75 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -63483,10 +58215,6 @@ index 08c499404beb..e4eb5944e021 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -63494,7 +58222,6 @@ index 08c499404beb..e4eb5944e021 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -63502,10 +58229,6 @@ index 08c499404beb..e4eb5944e021 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -63518,10 +58241,6 @@ index 08c499404beb..e4eb5944e021 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -63548,11 +58267,18 @@ index 08c499404beb..e4eb5944e021 100644
- DEFINES["_WINDOWS"] = True
- DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
- DEFINES["__STD_C"] = True
+-
+- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
+- "winmm"
+- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -138,69 +73,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -128,69 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -63626,7 +58352,7 @@ index 08c499404beb..e4eb5944e021 100644
Library("primitives_gn")
diff --git third_party/libwebrtc/modules/module_api_gn/moz.build third_party/libwebrtc/modules/module_api_gn/moz.build
-index f7bcafadcd73..f41f90b9b985 100644
+index 88c4f9659e24..57cdaa5b4aa7 100644
--- third_party/libwebrtc/modules/module_api_gn/moz.build
+++ third_party/libwebrtc/modules/module_api_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -63637,6 +58363,7 @@ index f7bcafadcd73..f41f90b9b985 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -63645,13 +58372,12 @@ index f7bcafadcd73..f41f90b9b985 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63686,7 +58412,6 @@ index f7bcafadcd73..f41f90b9b985 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -63736,7 +58461,7 @@ index f7bcafadcd73..f41f90b9b985 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -63762,7 +58487,7 @@ index f7bcafadcd73..f41f90b9b985 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -63804,7 +58529,7 @@ index f7bcafadcd73..f41f90b9b985 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 18ed1d8f113e..b8b1a89645df 100644
+index 60a59ac68ba0..5cadc26111a4 100644
--- third_party/libwebrtc/modules/module_api_public_gn/moz.build
+++ third_party/libwebrtc/modules/module_api_public_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -63815,6 +58540,7 @@ index 18ed1d8f113e..b8b1a89645df 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -63823,13 +58549,12 @@ index 18ed1d8f113e..b8b1a89645df 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63864,7 +58589,6 @@ index 18ed1d8f113e..b8b1a89645df 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -63914,7 +58638,7 @@ index 18ed1d8f113e..b8b1a89645df 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -63940,7 +58664,7 @@ index 18ed1d8f113e..b8b1a89645df 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -63982,7 +58706,7 @@ index 18ed1d8f113e..b8b1a89645df 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 848229844edd..0d1db13f4e15 100644
+index af36f290a1db..bbb06a63bfc0 100644
--- third_party/libwebrtc/modules/module_fec_api_gn/moz.build
+++ third_party/libwebrtc/modules/module_fec_api_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -63993,6 +58717,7 @@ index 848229844edd..0d1db13f4e15 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -64001,13 +58726,12 @@ index 848229844edd..0d1db13f4e15 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64042,7 +58766,6 @@ index 848229844edd..0d1db13f4e15 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -64092,7 +58815,7 @@ index 848229844edd..0d1db13f4e15 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -64118,7 +58841,7 @@ index 848229844edd..0d1db13f4e15 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -64160,18 +58883,10 @@ index 848229844edd..0d1db13f4e15 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 440873268213..690d12ace5e1 100644
+index 1a5e2ac45c89..b9cc24f035e6 100644
--- third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
+++ third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -64179,6 +58894,7 @@ index 440873268213..690d12ace5e1 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -64187,23 +58903,18 @@ index 440873268213..690d12ace5e1 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -64222,10 +58933,6 @@ index 440873268213..690d12ace5e1 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -64233,10 +58940,6 @@ index 440873268213..690d12ace5e1 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -64244,7 +58947,6 @@ index 440873268213..690d12ace5e1 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -64252,10 +58954,6 @@ index 440873268213..690d12ace5e1 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -64268,10 +58966,6 @@ index 440873268213..690d12ace5e1 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -64302,7 +58996,7 @@ index 440873268213..690d12ace5e1 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -64389,18 +59083,10 @@ index 440873268213..690d12ace5e1 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 3988f5c881cf..a7bf33d61697 100644
+index f9e685490ccc..9c976398855b 100644
--- third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
+++ third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -64408,6 +59094,7 @@ index 3988f5c881cf..a7bf33d61697 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -64416,23 +59103,18 @@ index 3988f5c881cf..a7bf33d61697 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -53,115 +66,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,94 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -64452,10 +59134,6 @@ index 3988f5c881cf..a7bf33d61697 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -64463,10 +59141,6 @@ index 3988f5c881cf..a7bf33d61697 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -64474,7 +59148,6 @@ index 3988f5c881cf..a7bf33d61697 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -64482,10 +59155,6 @@ index 3988f5c881cf..a7bf33d61697 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -64498,10 +59167,6 @@ index 3988f5c881cf..a7bf33d61697 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -64539,7 +59204,7 @@ index 3988f5c881cf..a7bf33d61697 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -169,82 +74,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -148,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -64597,10 +59262,10 @@ index 3988f5c881cf..a7bf33d61697 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -64611,10 +59276,10 @@ index 3988f5c881cf..a7bf33d61697 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -64626,10 +59291,10 @@ index 3988f5c881cf..a7bf33d61697 100644
Library("pacing_gn")
diff --git third_party/libwebrtc/modules/portal/portal_gn/moz.build third_party/libwebrtc/modules/portal/portal_gn/moz.build
-index db71b13e786c..393e3a0ce470 100644
+index a50648a9760d..c23281dee375 100644
--- third_party/libwebrtc/modules/portal/portal_gn/moz.build
+++ third_party/libwebrtc/modules/portal/portal_gn/moz.build
-@@ -30,21 +30,17 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -26,21 +26,18 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -64639,6 +59304,7 @@ index db71b13e786c..393e3a0ce470 100644
-DEFINES["USE_UDEV"] = True
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
-DEFINES["WEBRTC_LINUX"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
@@ -64647,12 +59313,11 @@ index db71b13e786c..393e3a0ce470 100644
DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
DEFINES["WEBRTC_USE_PIPEWIRE"] = True
DEFINES["_FILE_OFFSET_BITS"] = "64"
--DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
-DEFINES["_GNU_SOURCE"] = True
DEFINES["_LARGEFILE64_SOURCE"] = True
DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-@@ -89,16 +85,6 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+ DEFINES["__STDC_CONSTANT_MACROS"] = True
+@@ -84,16 +81,6 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -64670,18 +59335,10 @@ index db71b13e786c..393e3a0ce470 100644
DEFINES["MIPS32_LE"] = True
diff --git third_party/libwebrtc/modules/remote_bitrate_estimator/congestion_control_feedback_generator_gn/moz.build third_party/libwebrtc/modules/remote_bitrate_estimator/congestion_control_feedback_generator_gn/moz.build
-index 2ec77e5170f0..20a02cc02752 100644
+index 5f89c5fb33ad..23e0dcd377fa 100644
--- third_party/libwebrtc/modules/remote_bitrate_estimator/congestion_control_feedback_generator_gn/moz.build
+++ third_party/libwebrtc/modules/remote_bitrate_estimator/congestion_control_feedback_generator_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -64689,6 +59346,7 @@ index 2ec77e5170f0..20a02cc02752 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -64697,23 +59355,18 @@ index 2ec77e5170f0..20a02cc02752 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -64732,10 +59385,6 @@ index 2ec77e5170f0..20a02cc02752 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -64743,10 +59392,6 @@ index 2ec77e5170f0..20a02cc02752 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -64754,7 +59399,6 @@ index 2ec77e5170f0..20a02cc02752 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -64762,10 +59406,6 @@ index 2ec77e5170f0..20a02cc02752 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -64778,10 +59418,6 @@ index 2ec77e5170f0..20a02cc02752 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -64819,7 +59455,7 @@ index 2ec77e5170f0..20a02cc02752 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -64877,10 +59513,10 @@ index 2ec77e5170f0..20a02cc02752 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -64891,10 +59527,10 @@ index 2ec77e5170f0..20a02cc02752 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -64906,18 +59542,10 @@ index 2ec77e5170f0..20a02cc02752 100644
Library("congestion_control_feedback_generator_gn")
diff --git third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
-index fe512fc45b91..bc6627a86e52 100644
+index 44a231954c82..bf00b83cbc62 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -64925,6 +59553,7 @@ index fe512fc45b91..bc6627a86e52 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -64933,23 +59562,18 @@ index fe512fc45b91..bc6627a86e52 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -55,114 +68,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -55,93 +64,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -64968,10 +59592,6 @@ index fe512fc45b91..bc6627a86e52 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -64979,10 +59599,6 @@ index fe512fc45b91..bc6627a86e52 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -64990,7 +59606,6 @@ index fe512fc45b91..bc6627a86e52 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -64998,10 +59613,6 @@ index fe512fc45b91..bc6627a86e52 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -65014,10 +59625,6 @@ index fe512fc45b91..bc6627a86e52 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -65055,7 +59662,7 @@ index fe512fc45b91..bc6627a86e52 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -170,82 +76,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -149,82 +72,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -65113,10 +59720,10 @@ index fe512fc45b91..bc6627a86e52 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -65127,10 +59734,10 @@ index fe512fc45b91..bc6627a86e52 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -65142,7 +59749,7 @@ index fe512fc45b91..bc6627a86e52 100644
Library("remote_bitrate_estimator_gn")
diff --git third_party/libwebrtc/modules/remote_bitrate_estimator/rtp_transport_feedback_generator_gn/moz.build third_party/libwebrtc/modules/remote_bitrate_estimator/rtp_transport_feedback_generator_gn/moz.build
-index c2e7377ddfd4..4e66ff5db13a 100644
+index 72f3f6d79b1f..319c8f69ecf6 100644
--- third_party/libwebrtc/modules/remote_bitrate_estimator/rtp_transport_feedback_generator_gn/moz.build
+++ third_party/libwebrtc/modules/remote_bitrate_estimator/rtp_transport_feedback_generator_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -65153,6 +59760,7 @@ index c2e7377ddfd4..4e66ff5db13a 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -65161,13 +59769,12 @@ index c2e7377ddfd4..4e66ff5db13a 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65206,7 +59813,6 @@ index c2e7377ddfd4..4e66ff5db13a 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -65263,7 +59869,7 @@ index c2e7377ddfd4..4e66ff5db13a 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -65289,7 +59895,7 @@ index c2e7377ddfd4..4e66ff5db13a 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -65331,18 +59937,10 @@ index c2e7377ddfd4..4e66ff5db13a 100644
-
Library("rtp_transport_feedback_generator_gn")
diff --git third_party/libwebrtc/modules/remote_bitrate_estimator/transport_sequence_number_feedback_generator_gn/moz.build third_party/libwebrtc/modules/remote_bitrate_estimator/transport_sequence_number_feedback_generator_gn/moz.build
-index ef714742ae33..1bb93172f690 100644
+index e445120c239a..add7af188efb 100644
--- third_party/libwebrtc/modules/remote_bitrate_estimator/transport_sequence_number_feedback_generator_gn/moz.build
+++ third_party/libwebrtc/modules/remote_bitrate_estimator/transport_sequence_number_feedback_generator_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -65350,6 +59948,7 @@ index ef714742ae33..1bb93172f690 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -65358,23 +59957,18 @@ index ef714742ae33..1bb93172f690 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -65393,10 +59987,6 @@ index ef714742ae33..1bb93172f690 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -65404,10 +59994,6 @@ index ef714742ae33..1bb93172f690 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -65415,7 +60001,6 @@ index ef714742ae33..1bb93172f690 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -65423,10 +60008,6 @@ index ef714742ae33..1bb93172f690 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -65439,10 +60020,6 @@ index ef714742ae33..1bb93172f690 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -65480,7 +60057,7 @@ index ef714742ae33..1bb93172f690 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -65538,10 +60115,10 @@ index ef714742ae33..1bb93172f690 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -65552,10 +60129,10 @@ index ef714742ae33..1bb93172f690 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -65567,18 +60144,10 @@ index ef714742ae33..1bb93172f690 100644
Library("transport_sequence_number_feedback_generator_gn")
diff --git third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
-index a9e95be32c67..58a2fad51751 100644
+index 863003cc6dba..f373e77842eb 100644
--- third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
+++ third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -65586,6 +60155,7 @@ index a9e95be32c67..58a2fad51751 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -65594,23 +60164,18 @@ index a9e95be32c67..58a2fad51751 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,103 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -65625,10 +60190,6 @@ index a9e95be32c67..58a2fad51751 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -65636,10 +60197,6 @@ index a9e95be32c67..58a2fad51751 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -65647,7 +60204,6 @@ index a9e95be32c67..58a2fad51751 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -65655,10 +60211,6 @@ index a9e95be32c67..58a2fad51751 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -65671,10 +60223,6 @@ index a9e95be32c67..58a2fad51751 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -65705,7 +60253,7 @@ index a9e95be32c67..58a2fad51751 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -150,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -65763,10 +60311,10 @@ index a9e95be32c67..58a2fad51751 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -65777,10 +60325,10 @@ index a9e95be32c67..58a2fad51751 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -65792,18 +60340,10 @@ index a9e95be32c67..58a2fad51751 100644
Library("leb128_gn")
diff --git third_party/libwebrtc/modules/rtp_rtcp/ntp_time_util_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/ntp_time_util_gn/moz.build
-index 71a7444f6edd..704888734d11 100644
+index fb98c4bc6b0a..059bd85c05f4 100644
--- third_party/libwebrtc/modules/rtp_rtcp/ntp_time_util_gn/moz.build
+++ third_party/libwebrtc/modules/rtp_rtcp/ntp_time_util_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -65811,6 +60351,7 @@ index 71a7444f6edd..704888734d11 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -65819,23 +60360,18 @@ index 71a7444f6edd..704888734d11 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -65854,10 +60390,6 @@ index 71a7444f6edd..704888734d11 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -65865,10 +60397,6 @@ index 71a7444f6edd..704888734d11 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -65876,7 +60404,6 @@ index 71a7444f6edd..704888734d11 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -65884,10 +60411,6 @@ index 71a7444f6edd..704888734d11 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -65900,10 +60423,6 @@ index 71a7444f6edd..704888734d11 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -65941,7 +60460,7 @@ index 71a7444f6edd..704888734d11 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -65999,10 +60518,10 @@ index 71a7444f6edd..704888734d11 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -66013,10 +60532,10 @@ index 71a7444f6edd..704888734d11 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -66028,18 +60547,10 @@ index 71a7444f6edd..704888734d11 100644
Library("ntp_time_util_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 4d06f22b32e5..190a6e1710c9 100644
+index fdec383ccab9..3abb078532e3 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -66047,6 +60558,7 @@ index 4d06f22b32e5..190a6e1710c9 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -66055,23 +60567,18 @@ index 4d06f22b32e5..190a6e1710c9 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -90,114 +103,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -90,93 +99,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -66090,10 +60597,6 @@ index 4d06f22b32e5..190a6e1710c9 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -66101,10 +60604,6 @@ index 4d06f22b32e5..190a6e1710c9 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -66112,7 +60611,6 @@ index 4d06f22b32e5..190a6e1710c9 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -66120,10 +60618,6 @@ index 4d06f22b32e5..190a6e1710c9 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -66136,10 +60630,6 @@ index 4d06f22b32e5..190a6e1710c9 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -66177,7 +60667,7 @@ index 4d06f22b32e5..190a6e1710c9 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -205,82 +111,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -184,82 +107,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -66264,18 +60754,10 @@ index 4d06f22b32e5..190a6e1710c9 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 b7451abdb35b..0e5b16913861 100644
+index 3a7e03c6c39a..f22cc7aee488 100644
--- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
+++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -66283,6 +60765,7 @@ index b7451abdb35b..0e5b16913861 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -66291,23 +60774,18 @@ index b7451abdb35b..0e5b16913861 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -100,115 +113,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -100,94 +109,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -66327,10 +60805,6 @@ index b7451abdb35b..0e5b16913861 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -66338,10 +60812,6 @@ index b7451abdb35b..0e5b16913861 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -66349,7 +60819,6 @@ index b7451abdb35b..0e5b16913861 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -66357,10 +60826,6 @@ index b7451abdb35b..0e5b16913861 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -66373,10 +60838,6 @@ index b7451abdb35b..0e5b16913861 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -66414,7 +60875,7 @@ index b7451abdb35b..0e5b16913861 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -216,82 +121,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -195,82 +117,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -66501,18 +60962,10 @@ index b7451abdb35b..0e5b16913861 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 aa8cff1debbf..b2fb4ea1f57b 100644
+index e9dd4a5fb67c..95494a301fdf 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -66520,6 +60973,7 @@ index aa8cff1debbf..b2fb4ea1f57b 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -66528,23 +60982,18 @@ index aa8cff1debbf..b2fb4ea1f57b 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -66563,10 +61012,6 @@ index aa8cff1debbf..b2fb4ea1f57b 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -66574,10 +61019,6 @@ index aa8cff1debbf..b2fb4ea1f57b 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -66585,7 +61026,6 @@ index aa8cff1debbf..b2fb4ea1f57b 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -66593,10 +61033,6 @@ index aa8cff1debbf..b2fb4ea1f57b 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -66609,10 +61045,6 @@ index aa8cff1debbf..b2fb4ea1f57b 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -66650,7 +61082,7 @@ index aa8cff1debbf..b2fb4ea1f57b 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -66708,10 +61140,10 @@ index aa8cff1debbf..b2fb4ea1f57b 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -66722,10 +61154,10 @@ index aa8cff1debbf..b2fb4ea1f57b 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -66737,7 +61169,7 @@ index aa8cff1debbf..b2fb4ea1f57b 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 44fe26802729..b9454797a98d 100644
+index 4e3b42f6558b..ad4e476910dc 100644
--- third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
+++ third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -66748,6 +61180,7 @@ index 44fe26802729..b9454797a98d 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -66756,13 +61189,12 @@ index 44fe26802729..b9454797a98d 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,83 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66797,7 +61229,6 @@ index 44fe26802729..b9454797a98d 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -66847,7 +61278,7 @@ index 44fe26802729..b9454797a98d 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -66934,7 +61365,7 @@ index 44fe26802729..b9454797a98d 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 dbc294fa96ab..9a429e728f39 100644
+index 92205c179088..f2769d4fd4d2 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -66945,6 +61376,7 @@ index dbc294fa96ab..9a429e728f39 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -66953,13 +61385,12 @@ index dbc294fa96ab..9a429e728f39 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,83 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66994,7 +61425,6 @@ index dbc294fa96ab..9a429e728f39 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -67044,7 +61474,7 @@ index dbc294fa96ab..9a429e728f39 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -67131,7 +61561,7 @@ index dbc294fa96ab..9a429e728f39 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 d88730be83ca..eb0e3d9776c2 100644
+index 18a478d539ee..af5dea7e19d3 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -67142,6 +61572,7 @@ index d88730be83ca..eb0e3d9776c2 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -67150,13 +61581,12 @@ index d88730be83ca..eb0e3d9776c2 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -50,83 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,82 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67191,7 +61621,6 @@ index d88730be83ca..eb0e3d9776c2 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -67241,7 +61670,7 @@ index d88730be83ca..eb0e3d9776c2 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -134,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -67328,7 +61757,7 @@ index d88730be83ca..eb0e3d9776c2 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 747a68987a76..91501607fb33 100644
+index 39011ae5e091..422703862311 100644
--- third_party/libwebrtc/modules/utility/utility_gn/moz.build
+++ third_party/libwebrtc/modules/utility/utility_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -67339,6 +61768,7 @@ index 747a68987a76..91501607fb33 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -67347,23 +61777,18 @@ index 747a68987a76..91501607fb33 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,95 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,90 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -67400,7 +61825,6 @@ index 747a68987a76..91501607fb33 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -67450,7 +61874,7 @@ index 747a68987a76..91501607fb33 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -67476,7 +61900,7 @@ index 747a68987a76..91501607fb33 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -166,52 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -161,52 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -67530,18 +61954,10 @@ index 747a68987a76..91501607fb33 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 8ec96d9a4a86..5d4869cd7f86 100644
+index ed3ef3b74c07..d03874fab0d2 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,16 +14,29 @@ if not CONFIG["MOZ_SYSTEM_PIPEWIRE"]:
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -18,12 +18,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -67549,6 +61965,7 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -67557,13 +61974,12 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -39,6 +52,10 @@ LOCAL_INCLUDES += [
+@@ -39,6 +48,10 @@ LOCAL_INCLUDES += [
]
UNIFIED_SOURCES += [
@@ -67574,17 +61990,13 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
"/third_party/libwebrtc/modules/video_capture/video_capture_options.cc"
]
-@@ -51,187 +68,14 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,166 +64,14 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -67603,10 +62015,6 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -67614,10 +62022,6 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -67625,7 +62029,6 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -67640,10 +62043,6 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -67663,10 +62062,6 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -67741,7 +62136,7 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
-
- DEFINES["MIPS32_LE"] = True
- DEFINES["MIPS_FPU_LE"] = True
- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
+- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
- DEFINES["_GNU_SOURCE"] = True
-
- LOCAL_INCLUDES += [
@@ -67758,13 +62153,13 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
-
-if CONFIG["TARGET_CPU"] == "mips64":
-
-- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
+ DEFINES["WEBRTC_USE_PIPEWIRE"] = True
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["__ARM_NEON__"] = "1"
LOCAL_INCLUDES += [
"/third_party/libepoxy/libepoxy/include/",
-@@ -245,44 +89,11 @@ if CONFIG["TARGET_CPU"] == "mips64":
+@@ -224,44 +85,11 @@ if CONFIG["TARGET_CPU"] == "mips64":
"/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
]
@@ -67812,7 +62207,7 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
LOCAL_INCLUDES += [
"/third_party/libepoxy/libepoxy/include/",
-@@ -296,10 +107,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+@@ -275,10 +103,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
"/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
]
@@ -67824,7 +62219,7 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
LOCAL_INCLUDES += [
"/third_party/libepoxy/libepoxy/include/",
-@@ -313,14 +123,14 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+@@ -292,14 +119,14 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
"/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
]
@@ -67841,7 +62236,7 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
LOCAL_INCLUDES += [
"/third_party/libepoxy/libepoxy/include/",
-@@ -334,10 +144,10 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -313,10 +140,10 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
"/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
]
@@ -67855,18 +62250,10 @@ index 8ec96d9a4a86..5d4869cd7f86 100644
LOCAL_INCLUDES += [
"/third_party/libepoxy/libepoxy/include/",
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 8e6a20c413c2..3dce7e24b7f2 100644
+index 7d2cb6e37fb9..d773975e789d 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -67874,6 +62261,7 @@ index 8e6a20c413c2..3dce7e24b7f2 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -67882,23 +62270,18 @@ index 8e6a20c413c2..3dce7e24b7f2 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -50,114 +63,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,93 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -67917,10 +62300,6 @@ index 8e6a20c413c2..3dce7e24b7f2 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -67928,10 +62307,6 @@ index 8e6a20c413c2..3dce7e24b7f2 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -67939,7 +62314,6 @@ index 8e6a20c413c2..3dce7e24b7f2 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -67947,10 +62321,6 @@ index 8e6a20c413c2..3dce7e24b7f2 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -67963,10 +62333,6 @@ index 8e6a20c413c2..3dce7e24b7f2 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -68004,7 +62370,7 @@ index 8e6a20c413c2..3dce7e24b7f2 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -165,82 +71,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -144,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -68062,10 +62428,10 @@ index 8e6a20c413c2..3dce7e24b7f2 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -68076,10 +62442,10 @@ index 8e6a20c413c2..3dce7e24b7f2 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -68091,18 +62457,10 @@ index 8e6a20c413c2..3dce7e24b7f2 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 09852f9680d2..0eeb8f20f052 100644
+index 1e7b10688f3e..0c9e69f6d9ce 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -68110,6 +62468,7 @@ index 09852f9680d2..0eeb8f20f052 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -68118,23 +62477,18 @@ index 09852f9680d2..0eeb8f20f052 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -68153,10 +62507,6 @@ index 09852f9680d2..0eeb8f20f052 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -68164,10 +62514,6 @@ index 09852f9680d2..0eeb8f20f052 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -68175,7 +62521,6 @@ index 09852f9680d2..0eeb8f20f052 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -68183,10 +62528,6 @@ index 09852f9680d2..0eeb8f20f052 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -68199,10 +62540,6 @@ index 09852f9680d2..0eeb8f20f052 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -68240,7 +62577,7 @@ index 09852f9680d2..0eeb8f20f052 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -68298,10 +62635,10 @@ index 09852f9680d2..0eeb8f20f052 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -68312,10 +62649,10 @@ index 09852f9680d2..0eeb8f20f052 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -68327,7 +62664,7 @@ index 09852f9680d2..0eeb8f20f052 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 18490a99922e..cd478d1ab4e0 100644
+index 05cfb2a8de36..730f9581e95a 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -68338,6 +62675,7 @@ index 18490a99922e..cd478d1ab4e0 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -68346,13 +62684,12 @@ index 18490a99922e..cd478d1ab4e0 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68391,7 +62728,6 @@ index 18490a99922e..cd478d1ab4e0 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -68441,7 +62777,7 @@ index 18490a99922e..cd478d1ab4e0 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -68467,7 +62803,7 @@ index 18490a99922e..cd478d1ab4e0 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -68509,18 +62845,10 @@ index 18490a99922e..cd478d1ab4e0 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 6a1fce1d5dfe..c4489b1da4a4 100644
+index 1f07c3406aa5..ce5dd4056087 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -68528,6 +62856,7 @@ index 6a1fce1d5dfe..c4489b1da4a4 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -68536,23 +62865,18 @@ index 6a1fce1d5dfe..c4489b1da4a4 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -68571,10 +62895,6 @@ index 6a1fce1d5dfe..c4489b1da4a4 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -68582,10 +62902,6 @@ index 6a1fce1d5dfe..c4489b1da4a4 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -68593,7 +62909,6 @@ index 6a1fce1d5dfe..c4489b1da4a4 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -68601,10 +62916,6 @@ index 6a1fce1d5dfe..c4489b1da4a4 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -68617,10 +62928,6 @@ index 6a1fce1d5dfe..c4489b1da4a4 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -68658,7 +62965,7 @@ index 6a1fce1d5dfe..c4489b1da4a4 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -68716,10 +63023,10 @@ index 6a1fce1d5dfe..c4489b1da4a4 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -68730,10 +63037,10 @@ index 6a1fce1d5dfe..c4489b1da4a4 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -68745,18 +63052,10 @@ index 6a1fce1d5dfe..c4489b1da4a4 100644
Library("av1_svc_config_gn")
diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn/moz.build
-index bb6f0eeaffb8..cba1557d956e 100644
+index c1c8b0a7c64e..858945cd9a2e 100644
--- third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn/moz.build
-@@ -12,16 +12,29 @@ if CONFIG["MOZ_SYSTEM_AV1"]:
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -16,12 +16,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -68764,6 +63063,7 @@ index bb6f0eeaffb8..cba1557d956e 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -68772,23 +63072,18 @@ index bb6f0eeaffb8..cba1557d956e 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -53,114 +66,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,93 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -68807,10 +63102,6 @@ index bb6f0eeaffb8..cba1557d956e 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -68818,10 +63109,6 @@ index bb6f0eeaffb8..cba1557d956e 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -68829,7 +63116,6 @@ index bb6f0eeaffb8..cba1557d956e 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -68837,10 +63123,6 @@ index bb6f0eeaffb8..cba1557d956e 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -68853,10 +63135,6 @@ index bb6f0eeaffb8..cba1557d956e 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -68894,7 +63172,7 @@ index bb6f0eeaffb8..cba1557d956e 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -168,82 +74,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -147,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -68952,10 +63230,10 @@ index bb6f0eeaffb8..cba1557d956e 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -68966,10 +63244,10 @@ index bb6f0eeaffb8..cba1557d956e 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -68981,18 +63259,10 @@ index bb6f0eeaffb8..cba1557d956e 100644
Library("dav1d_decoder_gn")
diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build
-index 64865e705dc2..b510d6294cbc 100644
+index 1b1bb0aebb9f..de9c51fe107e 100644
--- third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build
-@@ -12,16 +12,29 @@ if CONFIG["MOZ_SYSTEM_AV1"]:
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -16,12 +16,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -69000,6 +63270,7 @@ index 64865e705dc2..b510d6294cbc 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -69008,23 +63279,18 @@ index 64865e705dc2..b510d6294cbc 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -49,114 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,94 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -69038,15 +63304,12 @@ index 64865e705dc2..b510d6294cbc 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
+- "GLESv2",
- "log"
- ]
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -69054,10 +63317,6 @@ index 64865e705dc2..b510d6294cbc 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -69065,7 +63324,6 @@ index 64865e705dc2..b510d6294cbc 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -69073,10 +63331,6 @@ index 64865e705dc2..b510d6294cbc 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -69089,10 +63343,6 @@ index 64865e705dc2..b510d6294cbc 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -69130,7 +63380,7 @@ index 64865e705dc2..b510d6294cbc 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -164,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -144,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -69188,10 +63438,10 @@ index 64865e705dc2..b510d6294cbc 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -69202,10 +63452,10 @@ index 64865e705dc2..b510d6294cbc 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -69217,18 +63467,10 @@ index 64865e705dc2..b510d6294cbc 100644
Library("aom_av1_encoder_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 c7e6879e9c9b..a9e5d531c7f8 100644
+index 3d9b5c87e574..d9dd5185ae93 100644
--- third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -69236,6 +63478,7 @@ index c7e6879e9c9b..a9e5d531c7f8 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -69244,23 +63487,18 @@ index c7e6879e9c9b..a9e5d531c7f8 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -69279,10 +63517,6 @@ index c7e6879e9c9b..a9e5d531c7f8 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -69290,10 +63524,6 @@ index c7e6879e9c9b..a9e5d531c7f8 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -69301,7 +63531,6 @@ index c7e6879e9c9b..a9e5d531c7f8 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -69309,10 +63538,6 @@ index c7e6879e9c9b..a9e5d531c7f8 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -69325,10 +63550,6 @@ index c7e6879e9c9b..a9e5d531c7f8 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -69366,7 +63587,7 @@ index c7e6879e9c9b..a9e5d531c7f8 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -69424,10 +63645,10 @@ index c7e6879e9c9b..a9e5d531c7f8 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -69438,10 +63659,10 @@ index c7e6879e9c9b..a9e5d531c7f8 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -69453,18 +63674,10 @@ index c7e6879e9c9b..a9e5d531c7f8 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 6ed61e2ed514..c6e8ae200597 100644
+index c6f81b4ed4d4..b4bfea458e5c 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -69472,6 +63685,7 @@ index 6ed61e2ed514..c6e8ae200597 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -69480,23 +63694,18 @@ index 6ed61e2ed514..c6e8ae200597 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -69515,10 +63724,6 @@ index 6ed61e2ed514..c6e8ae200597 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -69526,10 +63731,6 @@ index 6ed61e2ed514..c6e8ae200597 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -69537,7 +63738,6 @@ index 6ed61e2ed514..c6e8ae200597 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -69545,10 +63745,6 @@ index 6ed61e2ed514..c6e8ae200597 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -69561,10 +63757,6 @@ index 6ed61e2ed514..c6e8ae200597 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -69602,7 +63794,7 @@ index 6ed61e2ed514..c6e8ae200597 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -69660,10 +63852,10 @@ index 6ed61e2ed514..c6e8ae200597 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -69674,10 +63866,10 @@ index 6ed61e2ed514..c6e8ae200597 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -69689,18 +63881,10 @@ index 6ed61e2ed514..c6e8ae200597 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 553ce31ed2dd..8ae9b6a7a492 100644
+index 251b15e896bf..3d298942614e 100644
--- third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -69708,6 +63892,7 @@ index 553ce31ed2dd..8ae9b6a7a492 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -69716,23 +63901,18 @@ index 553ce31ed2dd..8ae9b6a7a492 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -69751,10 +63931,6 @@ index 553ce31ed2dd..8ae9b6a7a492 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -69762,10 +63938,6 @@ index 553ce31ed2dd..8ae9b6a7a492 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -69773,7 +63945,6 @@ index 553ce31ed2dd..8ae9b6a7a492 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -69781,10 +63952,6 @@ index 553ce31ed2dd..8ae9b6a7a492 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -69797,10 +63964,6 @@ index 553ce31ed2dd..8ae9b6a7a492 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -69838,7 +64001,7 @@ index 553ce31ed2dd..8ae9b6a7a492 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -69896,24 +64059,231 @@ index 553ce31ed2dd..8ae9b6a7a492 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+-
- CXXFLAGS += [
- "-msse2"
- ]
-
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
++if CONFIG["TARGET_CPU"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+ Library("frame_helpers_gn")
+diff --git third_party/libwebrtc/modules/video_coding/frame_sampler_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_sampler_gn/moz.build
+index 0b9bedb1d288..aeb9164b7b97 100644
+--- third_party/libwebrtc/modules/video_coding/frame_sampler_gn/moz.build
++++ third_party/libwebrtc/modules/video_coding/frame_sampler_gn/moz.build
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
++DEFINES["_FILE_OFFSET_BITS"] = "64"
++DEFINES["_LARGEFILE64_SOURCE"] = True
++DEFINES["_LARGEFILE_SOURCE"] = True
++DEFINES["__STDC_CONSTANT_MACROS"] = True
++DEFINES["__STDC_FORMAT_MACROS"] = True
+
+ FINAL_LIBRARY = "xul"
+
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
-
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_FILE_OFFSET_BITS"] = "64"
+- DEFINES["_LARGEFILE64_SOURCE"] = True
+- DEFINES["_LARGEFILE_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["WEBRTC_BSD"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_FILE_OFFSET_BITS"] = "64"
+- DEFINES["_LARGEFILE64_SOURCE"] = True
+- DEFINES["_LARGEFILE_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+- DEFINES["NOMINMAX"] = True
+- DEFINES["NTDDI_VERSION"] = "0x0A000000"
+- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
+- DEFINES["UNICODE"] = True
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["WEBRTC_WIN"] = True
+- DEFINES["WIN32"] = True
+- DEFINES["WIN32_LEAN_AND_MEAN"] = True
+- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+- DEFINES["WINVER"] = "0x0A00"
+- DEFINES["_ATL_NO_OPENGL"] = True
+- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
+- DEFINES["_CRT_RAND_S"] = True
+- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
+- DEFINES["_HAS_EXCEPTIONS"] = "0"
+- DEFINES["_HAS_NODISCARD"] = True
+- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+- DEFINES["_SECURE_ATL"] = True
+- DEFINES["_UNICODE"] = True
+- DEFINES["_WIN32_WINNT"] = "0x0A00"
+- DEFINES["_WINDOWS"] = True
+- DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
+- DEFINES["__STD_C"] = True
+-
+- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
+- "winmm"
+- ]
++ DEFINES["_DEBUG"] = True
+
+ if CONFIG["TARGET_CPU"] == "aarch64":
+
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+ DEFINES["WEBRTC_HAS_NEON"] = True
+ DEFINES["__ARM_NEON__"] = "1"
+
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+- CXXFLAGS += [
+- "-mfpu=neon"
+- ]
+-
+- DEFINES["WEBRTC_ARCH_ARM"] = True
+- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["TARGET_CPU"] == "loongarch64":
-
- DEFINES["_GNU_SOURCE"] = True
-
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+ if CONFIG["TARGET_CPU"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["TARGET_CPU"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["TARGET_CPU"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
CXXFLAGS += [
"-msse2"
]
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -69923,20 +64293,12 @@ index 553ce31ed2dd..8ae9b6a7a492 100644
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- Library("frame_helpers_gn")
+ Library("frame_sampler_gn")
diff --git third_party/libwebrtc/modules/video_coding/h264_sprop_parameter_sets_gn/moz.build third_party/libwebrtc/modules/video_coding/h264_sprop_parameter_sets_gn/moz.build
-index eb7fb47746e0..e76ba8ac7cd1 100644
+index d71cb5796e1d..a13914a39e24 100644
--- third_party/libwebrtc/modules/video_coding/h264_sprop_parameter_sets_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/h264_sprop_parameter_sets_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -69944,6 +64306,7 @@ index eb7fb47746e0..e76ba8ac7cd1 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -69952,23 +64315,18 @@ index eb7fb47746e0..e76ba8ac7cd1 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -69987,10 +64345,6 @@ index eb7fb47746e0..e76ba8ac7cd1 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -69998,10 +64352,6 @@ index eb7fb47746e0..e76ba8ac7cd1 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -70009,7 +64359,6 @@ index eb7fb47746e0..e76ba8ac7cd1 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -70017,10 +64366,6 @@ index eb7fb47746e0..e76ba8ac7cd1 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -70033,10 +64378,6 @@ index eb7fb47746e0..e76ba8ac7cd1 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -70074,7 +64415,7 @@ index eb7fb47746e0..e76ba8ac7cd1 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -70132,10 +64473,10 @@ index eb7fb47746e0..e76ba8ac7cd1 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -70146,10 +64487,10 @@ index eb7fb47746e0..e76ba8ac7cd1 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -70161,18 +64502,10 @@ index eb7fb47746e0..e76ba8ac7cd1 100644
Library("h264_sprop_parameter_sets_gn")
diff --git third_party/libwebrtc/modules/video_coding/h26x_packet_buffer_gn/moz.build third_party/libwebrtc/modules/video_coding/h26x_packet_buffer_gn/moz.build
-index 34122a4e87a4..d13e4278cbe3 100644
+index e672f30de7f8..a6581971c3ff 100644
--- third_party/libwebrtc/modules/video_coding/h26x_packet_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/h26x_packet_buffer_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -70180,6 +64513,7 @@ index 34122a4e87a4..d13e4278cbe3 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -70188,23 +64522,18 @@ index 34122a4e87a4..d13e4278cbe3 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -70223,10 +64552,6 @@ index 34122a4e87a4..d13e4278cbe3 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -70234,10 +64559,6 @@ index 34122a4e87a4..d13e4278cbe3 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -70245,7 +64566,6 @@ index 34122a4e87a4..d13e4278cbe3 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -70253,10 +64573,6 @@ index 34122a4e87a4..d13e4278cbe3 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -70269,10 +64585,6 @@ index 34122a4e87a4..d13e4278cbe3 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -70310,7 +64622,7 @@ index 34122a4e87a4..d13e4278cbe3 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -70368,10 +64680,10 @@ index 34122a4e87a4..d13e4278cbe3 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -70382,10 +64694,10 @@ index 34122a4e87a4..d13e4278cbe3 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -70397,18 +64709,10 @@ index 34122a4e87a4..d13e4278cbe3 100644
Library("h26x_packet_buffer_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 4cca5934baed..0d44d1ae0915 100644
+index 4d6c27a8cc9f..0f47848b2873 100644
--- third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -70416,6 +64720,7 @@ index 4cca5934baed..0d44d1ae0915 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -70424,23 +64729,18 @@ index 4cca5934baed..0d44d1ae0915 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -70459,10 +64759,6 @@ index 4cca5934baed..0d44d1ae0915 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -70470,10 +64766,6 @@ index 4cca5934baed..0d44d1ae0915 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -70481,7 +64773,6 @@ index 4cca5934baed..0d44d1ae0915 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -70489,10 +64780,6 @@ index 4cca5934baed..0d44d1ae0915 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -70505,10 +64792,6 @@ index 4cca5934baed..0d44d1ae0915 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -70546,7 +64829,7 @@ index 4cca5934baed..0d44d1ae0915 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -70604,10 +64887,10 @@ index 4cca5934baed..0d44d1ae0915 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -70618,10 +64901,10 @@ index 4cca5934baed..0d44d1ae0915 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -70633,18 +64916,10 @@ index 4cca5934baed..0d44d1ae0915 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 7cc5fe1a9bde..f8552b642dea 100644
+index 7583fd14da48..250ae7177cda 100644
--- third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -70652,6 +64927,7 @@ index 7cc5fe1a9bde..f8552b642dea 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -70660,23 +64936,18 @@ index 7cc5fe1a9bde..f8552b642dea 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -70695,10 +64966,6 @@ index 7cc5fe1a9bde..f8552b642dea 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -70706,10 +64973,6 @@ index 7cc5fe1a9bde..f8552b642dea 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -70717,7 +64980,6 @@ index 7cc5fe1a9bde..f8552b642dea 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -70725,10 +64987,6 @@ index 7cc5fe1a9bde..f8552b642dea 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -70741,10 +64999,6 @@ index 7cc5fe1a9bde..f8552b642dea 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -70782,7 +65036,7 @@ index 7cc5fe1a9bde..f8552b642dea 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -70840,10 +65094,10 @@ index 7cc5fe1a9bde..f8552b642dea 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -70854,10 +65108,10 @@ index 7cc5fe1a9bde..f8552b642dea 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -70869,18 +65123,10 @@ index 7cc5fe1a9bde..f8552b642dea 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 badcb68f6737..15b76f1c0da7 100644
+index 16a769513750..d073b9ad375e 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -70888,6 +65134,7 @@ index badcb68f6737..15b76f1c0da7 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -70896,23 +65143,18 @@ index badcb68f6737..15b76f1c0da7 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -70931,10 +65173,6 @@ index badcb68f6737..15b76f1c0da7 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -70942,10 +65180,6 @@ index badcb68f6737..15b76f1c0da7 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -70953,7 +65187,6 @@ index badcb68f6737..15b76f1c0da7 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -70961,10 +65194,6 @@ index badcb68f6737..15b76f1c0da7 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -70977,10 +65206,6 @@ index badcb68f6737..15b76f1c0da7 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -71018,7 +65243,7 @@ index badcb68f6737..15b76f1c0da7 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -71076,10 +65301,10 @@ index badcb68f6737..15b76f1c0da7 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -71090,10 +65315,10 @@ index badcb68f6737..15b76f1c0da7 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -71105,18 +65330,10 @@ index badcb68f6737..15b76f1c0da7 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 b96bece0f04e..99b1fa03fb5b 100644
+index 5540aa87f9c9..3ab93bb4ad62 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -71124,6 +65341,7 @@ index b96bece0f04e..99b1fa03fb5b 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -71132,23 +65350,18 @@ index b96bece0f04e..99b1fa03fb5b 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -53,114 +66,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,93 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -71167,10 +65380,6 @@ index b96bece0f04e..99b1fa03fb5b 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -71178,10 +65387,6 @@ index b96bece0f04e..99b1fa03fb5b 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -71189,7 +65394,6 @@ index b96bece0f04e..99b1fa03fb5b 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -71197,10 +65401,6 @@ index b96bece0f04e..99b1fa03fb5b 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -71213,10 +65413,6 @@ index b96bece0f04e..99b1fa03fb5b 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -71254,7 +65450,7 @@ index b96bece0f04e..99b1fa03fb5b 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -168,82 +74,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -147,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -71312,10 +65508,10 @@ index b96bece0f04e..99b1fa03fb5b 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -71326,10 +65522,10 @@ index b96bece0f04e..99b1fa03fb5b 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -71341,18 +65537,10 @@ index b96bece0f04e..99b1fa03fb5b 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 d40294966654..67deb7449935 100644
+index adbdcd25b8ac..eef0f099b359 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -71360,6 +65548,7 @@ index d40294966654..67deb7449935 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -71368,23 +65557,18 @@ index d40294966654..67deb7449935 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -71403,10 +65587,6 @@ index d40294966654..67deb7449935 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -71414,10 +65594,6 @@ index d40294966654..67deb7449935 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -71425,7 +65601,6 @@ index d40294966654..67deb7449935 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -71433,10 +65608,6 @@ index d40294966654..67deb7449935 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -71449,10 +65620,6 @@ index d40294966654..67deb7449935 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -71483,7 +65650,7 @@ index d40294966654..67deb7449935 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -71570,18 +65737,10 @@ index d40294966654..67deb7449935 100644
Library("scalable_video_controller_gn")
diff --git third_party/libwebrtc/modules/video_coding/svc/simulcast_to_svc_converter_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/simulcast_to_svc_converter_gn/moz.build
-index 5118ad8887ff..5a330718a6d6 100644
+index f58ee6d17f4f..a2bb00a16786 100644
--- third_party/libwebrtc/modules/video_coding/svc/simulcast_to_svc_converter_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/svc/simulcast_to_svc_converter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -71589,6 +65748,7 @@ index 5118ad8887ff..5a330718a6d6 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -71597,23 +65757,18 @@ index 5118ad8887ff..5a330718a6d6 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -71633,10 +65788,6 @@ index 5118ad8887ff..5a330718a6d6 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -71644,10 +65795,6 @@ index 5118ad8887ff..5a330718a6d6 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -71655,7 +65802,6 @@ index 5118ad8887ff..5a330718a6d6 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -71663,10 +65809,6 @@ index 5118ad8887ff..5a330718a6d6 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -71679,10 +65821,6 @@ index 5118ad8887ff..5a330718a6d6 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -71720,7 +65858,7 @@ index 5118ad8887ff..5a330718a6d6 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -71778,10 +65916,10 @@ index 5118ad8887ff..5a330718a6d6 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -71792,10 +65930,10 @@ index 5118ad8887ff..5a330718a6d6 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -71807,18 +65945,10 @@ index 5118ad8887ff..5a330718a6d6 100644
Library("simulcast_to_svc_converter_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 81a9f87adcea..bcf7384bb9fb 100644
+index 3429ebfbe312..544297c36cfe 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -71826,6 +65956,7 @@ index 81a9f87adcea..bcf7384bb9fb 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -71834,23 +65965,18 @@ index 81a9f87adcea..bcf7384bb9fb 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -71869,10 +65995,6 @@ index 81a9f87adcea..bcf7384bb9fb 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -71880,10 +66002,6 @@ index 81a9f87adcea..bcf7384bb9fb 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -71891,7 +66009,6 @@ index 81a9f87adcea..bcf7384bb9fb 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -71899,10 +66016,6 @@ index 81a9f87adcea..bcf7384bb9fb 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -71915,10 +66028,6 @@ index 81a9f87adcea..bcf7384bb9fb 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -71956,7 +66065,7 @@ index 81a9f87adcea..bcf7384bb9fb 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -72014,10 +66123,10 @@ index 81a9f87adcea..bcf7384bb9fb 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -72028,10 +66137,10 @@ index 81a9f87adcea..bcf7384bb9fb 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -72043,18 +66152,10 @@ index 81a9f87adcea..bcf7384bb9fb 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 896f0a068468..7982fdbd11b0 100644
+index 27c38ed7b639..bf60f4bd2dc5 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -72062,6 +66163,7 @@ index 896f0a068468..7982fdbd11b0 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -72070,23 +66172,18 @@ index 896f0a068468..7982fdbd11b0 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -72105,10 +66202,6 @@ index 896f0a068468..7982fdbd11b0 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -72116,10 +66209,6 @@ index 896f0a068468..7982fdbd11b0 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -72127,7 +66216,6 @@ index 896f0a068468..7982fdbd11b0 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -72135,10 +66223,6 @@ index 896f0a068468..7982fdbd11b0 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -72151,10 +66235,6 @@ index 896f0a068468..7982fdbd11b0 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -72185,7 +66265,7 @@ index 896f0a068468..7982fdbd11b0 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -72272,18 +66352,10 @@ index 896f0a068468..7982fdbd11b0 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 5cb93affcf11..b8ca3ea9ff03 100644
+index c84fe43bf7ce..06e4fdb58172 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -72291,6 +66363,7 @@ index 5cb93affcf11..b8ca3ea9ff03 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -72299,23 +66372,18 @@ index 5cb93affcf11..b8ca3ea9ff03 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -72334,10 +66402,6 @@ index 5cb93affcf11..b8ca3ea9ff03 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -72345,10 +66409,6 @@ index 5cb93affcf11..b8ca3ea9ff03 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -72356,7 +66416,6 @@ index 5cb93affcf11..b8ca3ea9ff03 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -72364,10 +66423,6 @@ index 5cb93affcf11..b8ca3ea9ff03 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -72380,10 +66435,6 @@ index 5cb93affcf11..b8ca3ea9ff03 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -72414,7 +66465,7 @@ index 5cb93affcf11..b8ca3ea9ff03 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -72501,18 +66552,10 @@ index 5cb93affcf11..b8ca3ea9ff03 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 2f25723192bb..171a70e310c7 100644
+index d33868bac4b2..2cae7d1663d2 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -72520,6 +66563,7 @@ index 2f25723192bb..171a70e310c7 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -72528,23 +66572,18 @@ index 2f25723192bb..171a70e310c7 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -72563,10 +66602,6 @@ index 2f25723192bb..171a70e310c7 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -72574,10 +66609,6 @@ index 2f25723192bb..171a70e310c7 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -72585,7 +66616,6 @@ index 2f25723192bb..171a70e310c7 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -72593,10 +66623,6 @@ index 2f25723192bb..171a70e310c7 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -72609,10 +66635,6 @@ index 2f25723192bb..171a70e310c7 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -72643,7 +66665,7 @@ index 2f25723192bb..171a70e310c7 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -72730,18 +66752,10 @@ index 2f25723192bb..171a70e310c7 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 01a5cbfaacb4..8bb43a2f8b3d 100644
+index 9f08b514eb3f..63970d48a4ff 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -72749,6 +66763,7 @@ index 01a5cbfaacb4..8bb43a2f8b3d 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -72757,23 +66772,18 @@ index 01a5cbfaacb4..8bb43a2f8b3d 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -72792,10 +66802,6 @@ index 01a5cbfaacb4..8bb43a2f8b3d 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -72803,10 +66809,6 @@ index 01a5cbfaacb4..8bb43a2f8b3d 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -72814,7 +66816,6 @@ index 01a5cbfaacb4..8bb43a2f8b3d 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -72822,10 +66823,6 @@ index 01a5cbfaacb4..8bb43a2f8b3d 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -72838,10 +66835,6 @@ index 01a5cbfaacb4..8bb43a2f8b3d 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -72879,7 +66872,7 @@ index 01a5cbfaacb4..8bb43a2f8b3d 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -72937,10 +66930,10 @@ index 01a5cbfaacb4..8bb43a2f8b3d 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -72951,10 +66944,10 @@ index 01a5cbfaacb4..8bb43a2f8b3d 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -72966,18 +66959,10 @@ index 01a5cbfaacb4..8bb43a2f8b3d 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 163aec282266..54552a3a74fb 100644
+index 092bdff85b3c..3ec4af4c6cbe 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -72985,6 +66970,7 @@ index 163aec282266..54552a3a74fb 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -72993,23 +66979,18 @@ index 163aec282266..54552a3a74fb 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -73028,10 +67009,6 @@ index 163aec282266..54552a3a74fb 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -73039,10 +67016,6 @@ index 163aec282266..54552a3a74fb 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -73050,7 +67023,6 @@ index 163aec282266..54552a3a74fb 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -73058,10 +67030,6 @@ index 163aec282266..54552a3a74fb 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -73074,10 +67042,6 @@ index 163aec282266..54552a3a74fb 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -73108,7 +67072,7 @@ index 163aec282266..54552a3a74fb 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -73195,18 +67159,10 @@ index 163aec282266..54552a3a74fb 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 7aaf581a3d26..cea6896013de 100644
+index 9de0f87aa8ec..8d9fcf670160 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -73214,6 +67170,7 @@ index 7aaf581a3d26..cea6896013de 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -73222,23 +67179,18 @@ index 7aaf581a3d26..cea6896013de 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -73257,10 +67209,6 @@ index 7aaf581a3d26..cea6896013de 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -73268,10 +67216,6 @@ index 7aaf581a3d26..cea6896013de 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -73279,7 +67223,6 @@ index 7aaf581a3d26..cea6896013de 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -73287,10 +67230,6 @@ index 7aaf581a3d26..cea6896013de 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -73303,10 +67242,6 @@ index 7aaf581a3d26..cea6896013de 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -73344,7 +67279,7 @@ index 7aaf581a3d26..cea6896013de 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -73402,10 +67337,10 @@ index 7aaf581a3d26..cea6896013de 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -73416,10 +67351,10 @@ index 7aaf581a3d26..cea6896013de 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -73431,18 +67366,10 @@ index 7aaf581a3d26..cea6896013de 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 b5d03bf28abf..50b7a418a899 100644
+index 496eb2282038..226b3928e1e8 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -73450,6 +67377,7 @@ index b5d03bf28abf..50b7a418a899 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -73458,23 +67386,18 @@ index b5d03bf28abf..50b7a418a899 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -73493,10 +67416,6 @@ index b5d03bf28abf..50b7a418a899 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -73504,10 +67423,6 @@ index b5d03bf28abf..50b7a418a899 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -73515,7 +67430,6 @@ index b5d03bf28abf..50b7a418a899 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -73523,10 +67437,6 @@ index b5d03bf28abf..50b7a418a899 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -73539,10 +67449,6 @@ index b5d03bf28abf..50b7a418a899 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -73580,7 +67486,7 @@ index b5d03bf28abf..50b7a418a899 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -73638,10 +67544,10 @@ index b5d03bf28abf..50b7a418a899 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -73652,10 +67558,10 @@ index b5d03bf28abf..50b7a418a899 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -73667,18 +67573,10 @@ index b5d03bf28abf..50b7a418a899 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 f290fb2a0fff..55937e920a1b 100644
+index a39517365ba9..49f00b43c0d7 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -73686,6 +67584,7 @@ index f290fb2a0fff..55937e920a1b 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -73694,23 +67593,18 @@ index f290fb2a0fff..55937e920a1b 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -48,114 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -73729,10 +67623,6 @@ index f290fb2a0fff..55937e920a1b 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -73740,10 +67630,6 @@ index f290fb2a0fff..55937e920a1b 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -73751,7 +67637,6 @@ index f290fb2a0fff..55937e920a1b 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -73759,10 +67644,6 @@ index f290fb2a0fff..55937e920a1b 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -73775,10 +67656,6 @@ index f290fb2a0fff..55937e920a1b 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -73816,7 +67693,7 @@ index f290fb2a0fff..55937e920a1b 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -163,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -73874,10 +67751,10 @@ index f290fb2a0fff..55937e920a1b 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -73888,10 +67765,10 @@ index f290fb2a0fff..55937e920a1b 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -73903,18 +67780,10 @@ index f290fb2a0fff..55937e920a1b 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 11ecb8ae48e1..e3b395a01ef8 100644
+index 44792bb4ce07..2fc63265c596 100644
--- third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -73922,6 +67791,7 @@ index 11ecb8ae48e1..e3b395a01ef8 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -73930,23 +67800,18 @@ index 11ecb8ae48e1..e3b395a01ef8 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -59,115 +72,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -59,94 +68,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -73966,10 +67831,6 @@ index 11ecb8ae48e1..e3b395a01ef8 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -73977,10 +67838,6 @@ index 11ecb8ae48e1..e3b395a01ef8 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -73988,7 +67845,6 @@ index 11ecb8ae48e1..e3b395a01ef8 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -73996,10 +67852,6 @@ index 11ecb8ae48e1..e3b395a01ef8 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -74012,10 +67864,6 @@ index 11ecb8ae48e1..e3b395a01ef8 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -74053,7 +67901,7 @@ index 11ecb8ae48e1..e3b395a01ef8 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -175,82 +80,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -154,82 +76,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -74111,10 +67959,10 @@ index 11ecb8ae48e1..e3b395a01ef8 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -74125,10 +67973,10 @@ index 11ecb8ae48e1..e3b395a01ef8 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -74140,18 +67988,10 @@ index 11ecb8ae48e1..e3b395a01ef8 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 23978645a548..745135543e16 100644
+index 3942f92586f6..0636656c36d1 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -74159,6 +67999,7 @@ index 23978645a548..745135543e16 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -74167,23 +68008,18 @@ index 23978645a548..745135543e16 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -58,115 +71,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -58,94 +67,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -74203,10 +68039,6 @@ index 23978645a548..745135543e16 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -74214,10 +68046,6 @@ index 23978645a548..745135543e16 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -74225,7 +68053,6 @@ index 23978645a548..745135543e16 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -74233,10 +68060,6 @@ index 23978645a548..745135543e16 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -74249,10 +68072,6 @@ index 23978645a548..745135543e16 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -74290,7 +68109,7 @@ index 23978645a548..745135543e16 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -174,82 +79,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -153,82 +75,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -74348,10 +68167,10 @@ index 23978645a548..745135543e16 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -74362,10 +68181,10 @@ index 23978645a548..745135543e16 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -74377,18 +68196,10 @@ index 23978645a548..745135543e16 100644
Library("video_coding_utility_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
-index e7966f60377b..e23460458ed9 100644
+index 17a993bfc02c..aa23c6c09134 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -74396,6 +68207,7 @@ index e7966f60377b..e23460458ed9 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -74404,23 +68216,18 @@ index e7966f60377b..e23460458ed9 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -51,115 +64,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,94 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -74440,10 +68247,6 @@ index e7966f60377b..e23460458ed9 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -74451,10 +68254,6 @@ index e7966f60377b..e23460458ed9 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -74462,7 +68261,6 @@ index e7966f60377b..e23460458ed9 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -74470,10 +68268,6 @@ index e7966f60377b..e23460458ed9 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -74486,10 +68280,6 @@ index e7966f60377b..e23460458ed9 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -74527,7 +68317,7 @@ index e7966f60377b..e23460458ed9 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -167,82 +72,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -146,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -74585,10 +68375,10 @@ index e7966f60377b..e23460458ed9 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -74599,10 +68389,10 @@ index e7966f60377b..e23460458ed9 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -74614,18 +68404,10 @@ index e7966f60377b..e23460458ed9 100644
Library("webrtc_h264_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
-index d71a26d07efc..013d0af5e8f4 100644
+index 1646d8078da0..a96575721cb6 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,16 +12,29 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -16,12 +16,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -74633,6 +68415,7 @@ index d71a26d07efc..013d0af5e8f4 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -74641,23 +68424,18 @@ index d71a26d07efc..013d0af5e8f4 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -49,107 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,86 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -74676,10 +68454,6 @@ index d71a26d07efc..013d0af5e8f4 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -74687,10 +68461,6 @@ index d71a26d07efc..013d0af5e8f4 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -74698,7 +68468,6 @@ index d71a26d07efc..013d0af5e8f4 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -74706,10 +68475,6 @@ index d71a26d07efc..013d0af5e8f4 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -74722,10 +68487,6 @@ index d71a26d07efc..013d0af5e8f4 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -74756,7 +68517,7 @@ index d71a26d07efc..013d0af5e8f4 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -157,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -74843,18 +68604,10 @@ index d71a26d07efc..013d0af5e8f4 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 c19e440232b4..e826bc9f0596 100644
+index 0fc3d55cad43..9ed831f4be8b 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
-@@ -12,16 +12,29 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -16,12 +16,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -74862,6 +68615,7 @@ index c19e440232b4..e826bc9f0596 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -74870,23 +68624,18 @@ index c19e440232b4..e826bc9f0596 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -52,115 +65,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,94 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -74906,10 +68655,6 @@ index c19e440232b4..e826bc9f0596 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -74917,10 +68662,6 @@ index c19e440232b4..e826bc9f0596 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -74928,7 +68669,6 @@ index c19e440232b4..e826bc9f0596 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -74936,10 +68676,6 @@ index c19e440232b4..e826bc9f0596 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -74952,10 +68688,6 @@ index c19e440232b4..e826bc9f0596 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -74993,7 +68725,7 @@ index c19e440232b4..e826bc9f0596 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -168,82 +73,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -147,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -75051,10 +68783,10 @@ index c19e440232b4..e826bc9f0596 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -75065,10 +68797,10 @@ index c19e440232b4..e826bc9f0596 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -75080,18 +68812,10 @@ index c19e440232b4..e826bc9f0596 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 731d28fe29fa..8771b6cfa66b 100644
+index 264dd08bc9a5..b0719d66ae1f 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -75099,6 +68823,7 @@ index 731d28fe29fa..8771b6cfa66b 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -75107,23 +68832,18 @@ index 731d28fe29fa..8771b6cfa66b 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -75142,10 +68862,6 @@ index 731d28fe29fa..8771b6cfa66b 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -75153,10 +68869,6 @@ index 731d28fe29fa..8771b6cfa66b 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -75164,7 +68876,6 @@ index 731d28fe29fa..8771b6cfa66b 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -75172,10 +68883,6 @@ index 731d28fe29fa..8771b6cfa66b 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -75188,10 +68895,6 @@ index 731d28fe29fa..8771b6cfa66b 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -75222,7 +68925,7 @@ index 731d28fe29fa..8771b6cfa66b 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -75309,18 +69012,10 @@ index 731d28fe29fa..8771b6cfa66b 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 e9f43541065d..347db215e01d 100644
+index c3f86866b4e4..940bd6044109 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -75328,6 +69023,7 @@ index e9f43541065d..347db215e01d 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -75336,23 +69032,18 @@ index e9f43541065d..347db215e01d 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -51,115 +64,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,94 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -75372,10 +69063,6 @@ index e9f43541065d..347db215e01d 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -75383,10 +69070,6 @@ index e9f43541065d..347db215e01d 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -75394,7 +69077,6 @@ index e9f43541065d..347db215e01d 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -75402,10 +69084,6 @@ index e9f43541065d..347db215e01d 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -75418,10 +69096,6 @@ index e9f43541065d..347db215e01d 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -75459,7 +69133,7 @@ index e9f43541065d..347db215e01d 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -167,82 +72,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -146,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -75517,10 +69191,10 @@ index e9f43541065d..347db215e01d 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -75531,10 +69205,10 @@ index e9f43541065d..347db215e01d 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -75546,18 +69220,10 @@ index e9f43541065d..347db215e01d 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 c428c10ef3b6..0d272d5b971a 100644
+index 92d397f83465..c72091405763 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
-@@ -12,16 +12,29 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -16,12 +16,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -75565,6 +69231,7 @@ index c428c10ef3b6..0d272d5b971a 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -75573,23 +69240,18 @@ index c428c10ef3b6..0d272d5b971a 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -54,115 +67,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,94 +63,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -75609,10 +69271,6 @@ index c428c10ef3b6..0d272d5b971a 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -75620,10 +69278,6 @@ index c428c10ef3b6..0d272d5b971a 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -75631,7 +69285,6 @@ index c428c10ef3b6..0d272d5b971a 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -75639,10 +69292,6 @@ index c428c10ef3b6..0d272d5b971a 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -75655,10 +69304,6 @@ index c428c10ef3b6..0d272d5b971a 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -75696,7 +69341,7 @@ index c428c10ef3b6..0d272d5b971a 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -170,82 +75,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -149,82 +71,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -75754,10 +69399,10 @@ index c428c10ef3b6..0d272d5b971a 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -75768,10 +69413,10 @@ index c428c10ef3b6..0d272d5b971a 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -75783,18 +69428,10 @@ index c428c10ef3b6..0d272d5b971a 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 b2f437e70e0e..4775059772a4 100644
+index efec0c59e146..c41bffcdf583 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -75802,6 +69439,7 @@ index b2f437e70e0e..4775059772a4 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -75810,23 +69448,18 @@ index b2f437e70e0e..4775059772a4 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -75845,10 +69478,6 @@ index b2f437e70e0e..4775059772a4 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -75856,10 +69485,6 @@ index b2f437e70e0e..4775059772a4 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -75867,7 +69492,6 @@ index b2f437e70e0e..4775059772a4 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -75875,10 +69499,6 @@ index b2f437e70e0e..4775059772a4 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -75891,10 +69511,6 @@ index b2f437e70e0e..4775059772a4 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -75932,7 +69548,7 @@ index b2f437e70e0e..4775059772a4 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -75990,10 +69606,10 @@ index b2f437e70e0e..4775059772a4 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -76004,10 +69620,10 @@ index b2f437e70e0e..4775059772a4 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -76019,10 +69635,10 @@ index b2f437e70e0e..4775059772a4 100644
Library("webrtc_vp9_helpers_gn")
diff --git third_party/libwebrtc/moz.build third_party/libwebrtc/moz.build
-index bf06d4c2bb47..93a8e11a140e 100644
+index a91b2002fc6f..7795b213903b 100644
--- third_party/libwebrtc/moz.build
+++ third_party/libwebrtc/moz.build
-@@ -291,6 +291,8 @@ DIRS += [
+@@ -292,6 +292,8 @@ DIRS += [
"/third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn",
"/third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn",
"/third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn",
@@ -76031,7 +69647,7 @@ index bf06d4c2bb47..93a8e11a140e 100644
"/third_party/libwebrtc/modules/module_api_gn",
"/third_party/libwebrtc/modules/module_api_public_gn",
"/third_party/libwebrtc/modules/module_fec_api_gn",
-@@ -516,138 +518,30 @@ DIRS += [
+@@ -517,138 +519,30 @@ DIRS += [
"/third_party/libwebrtc/webrtc_gn"
]
@@ -76174,7 +69790,7 @@ index bf06d4c2bb47..93a8e11a140e 100644
DIRS += [
"/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
-@@ -655,13 +549,11 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -656,13 +550,11 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
"/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
"/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
"/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
@@ -76189,7 +69805,7 @@ index bf06d4c2bb47..93a8e11a140e 100644
DIRS += [
"/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
-@@ -669,73 +561,6 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+@@ -670,73 +562,6 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
"/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
"/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
"/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
@@ -76264,7 +69880,7 @@ index bf06d4c2bb47..93a8e11a140e 100644
- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
- ]
diff --git third_party/libwebrtc/net/dcsctp/common/internal_types_gn/moz.build third_party/libwebrtc/net/dcsctp/common/internal_types_gn/moz.build
-index e948e7063568..cb82eed45dbd 100644
+index a2ef7098a26f..1e8a475473f4 100644
--- third_party/libwebrtc/net/dcsctp/common/internal_types_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/common/internal_types_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -76275,6 +69891,7 @@ index e948e7063568..cb82eed45dbd 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -76283,13 +69900,12 @@ index e948e7063568..cb82eed45dbd 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76328,7 +69944,6 @@ index e948e7063568..cb82eed45dbd 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -76378,7 +69993,7 @@ index e948e7063568..cb82eed45dbd 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -76404,7 +70019,7 @@ index e948e7063568..cb82eed45dbd 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -76446,7 +70061,7 @@ index e948e7063568..cb82eed45dbd 100644
-
Library("internal_types_gn")
diff --git third_party/libwebrtc/net/dcsctp/common/math_gn/moz.build third_party/libwebrtc/net/dcsctp/common/math_gn/moz.build
-index fb147e0954d8..7cf07c682496 100644
+index 6be46fd27bf6..400de7c7e0e2 100644
--- third_party/libwebrtc/net/dcsctp/common/math_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/common/math_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -76457,6 +70072,7 @@ index fb147e0954d8..7cf07c682496 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -76465,13 +70081,12 @@ index fb147e0954d8..7cf07c682496 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76506,7 +70121,6 @@ index fb147e0954d8..7cf07c682496 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -76556,7 +70170,7 @@ index fb147e0954d8..7cf07c682496 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -76582,7 +70196,7 @@ index fb147e0954d8..7cf07c682496 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -76624,7 +70238,7 @@ index fb147e0954d8..7cf07c682496 100644
-
Library("math_gn")
diff --git third_party/libwebrtc/net/dcsctp/common/sequence_numbers_gn/moz.build third_party/libwebrtc/net/dcsctp/common/sequence_numbers_gn/moz.build
-index 345f7a7a11dd..9059a5797011 100644
+index 4a44c05a257b..c073abe0d419 100644
--- third_party/libwebrtc/net/dcsctp/common/sequence_numbers_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/common/sequence_numbers_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -76635,6 +70249,7 @@ index 345f7a7a11dd..9059a5797011 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -76643,13 +70258,12 @@ index 345f7a7a11dd..9059a5797011 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76688,7 +70302,6 @@ index 345f7a7a11dd..9059a5797011 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -76738,7 +70351,7 @@ index 345f7a7a11dd..9059a5797011 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -76764,7 +70377,7 @@ index 345f7a7a11dd..9059a5797011 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -76806,7 +70419,7 @@ index 345f7a7a11dd..9059a5797011 100644
-
Library("sequence_numbers_gn")
diff --git third_party/libwebrtc/net/dcsctp/packet/bounded_io_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/bounded_io_gn/moz.build
-index f17dec091b41..61070979f313 100644
+index 35f9304a8ad6..9bc9113555e5 100644
--- third_party/libwebrtc/net/dcsctp/packet/bounded_io_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/packet/bounded_io_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -76817,6 +70430,7 @@ index f17dec091b41..61070979f313 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -76825,13 +70439,12 @@ index f17dec091b41..61070979f313 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76870,7 +70483,6 @@ index f17dec091b41..61070979f313 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -76920,7 +70532,7 @@ index f17dec091b41..61070979f313 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -76946,7 +70558,7 @@ index f17dec091b41..61070979f313 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -76988,18 +70600,10 @@ index f17dec091b41..61070979f313 100644
-
Library("bounded_io_gn")
diff --git third_party/libwebrtc/net/dcsctp/packet/chunk_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/chunk_gn/moz.build
-index 32a1cdfe66a6..6e89be08d86f 100644
+index 24a6a24e0850..21dfb53299c9 100644
--- third_party/libwebrtc/net/dcsctp/packet/chunk_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/packet/chunk_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -77007,6 +70611,7 @@ index 32a1cdfe66a6..6e89be08d86f 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -77015,23 +70620,18 @@ index 32a1cdfe66a6..6e89be08d86f 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -63,114 +76,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -63,93 +72,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -77050,10 +70650,6 @@ index 32a1cdfe66a6..6e89be08d86f 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -77061,10 +70657,6 @@ index 32a1cdfe66a6..6e89be08d86f 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -77072,7 +70664,6 @@ index 32a1cdfe66a6..6e89be08d86f 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -77080,10 +70671,6 @@ index 32a1cdfe66a6..6e89be08d86f 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -77096,10 +70683,6 @@ index 32a1cdfe66a6..6e89be08d86f 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -77137,7 +70720,7 @@ index 32a1cdfe66a6..6e89be08d86f 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -178,82 +84,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -157,82 +80,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -77195,10 +70778,10 @@ index 32a1cdfe66a6..6e89be08d86f 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -77209,10 +70792,10 @@ index 32a1cdfe66a6..6e89be08d86f 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -77224,18 +70807,10 @@ index 32a1cdfe66a6..6e89be08d86f 100644
Library("chunk_gn")
diff --git third_party/libwebrtc/net/dcsctp/packet/chunk_validators_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/chunk_validators_gn/moz.build
-index f303325e987b..f4e26f620052 100644
+index 9f8072ccbb75..7af95f92aa07 100644
--- third_party/libwebrtc/net/dcsctp/packet/chunk_validators_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/packet/chunk_validators_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -77243,6 +70818,7 @@ index f303325e987b..f4e26f620052 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -77251,23 +70827,18 @@ index f303325e987b..f4e26f620052 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -77286,10 +70857,6 @@ index f303325e987b..f4e26f620052 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -77297,10 +70864,6 @@ index f303325e987b..f4e26f620052 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -77308,7 +70871,6 @@ index f303325e987b..f4e26f620052 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -77316,10 +70878,6 @@ index f303325e987b..f4e26f620052 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -77332,10 +70890,6 @@ index f303325e987b..f4e26f620052 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -77373,7 +70927,7 @@ index f303325e987b..f4e26f620052 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -77431,10 +70985,10 @@ index f303325e987b..f4e26f620052 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -77445,10 +70999,10 @@ index f303325e987b..f4e26f620052 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -77460,18 +71014,10 @@ index f303325e987b..f4e26f620052 100644
Library("chunk_validators_gn")
diff --git third_party/libwebrtc/net/dcsctp/packet/crc32c_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/crc32c_gn/moz.build
-index b3453a6570d4..db239f833136 100644
+index 5d73b1db51a4..b41b8efa0ee2 100644
--- third_party/libwebrtc/net/dcsctp/packet/crc32c_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/packet/crc32c_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -77479,6 +71025,7 @@ index b3453a6570d4..db239f833136 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -77487,23 +71034,18 @@ index b3453a6570d4..db239f833136 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -77522,10 +71064,6 @@ index b3453a6570d4..db239f833136 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -77533,10 +71071,6 @@ index b3453a6570d4..db239f833136 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -77544,7 +71078,6 @@ index b3453a6570d4..db239f833136 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -77552,10 +71085,6 @@ index b3453a6570d4..db239f833136 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -77568,10 +71097,6 @@ index b3453a6570d4..db239f833136 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -77602,7 +71127,7 @@ index b3453a6570d4..db239f833136 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -77689,7 +71214,7 @@ index b3453a6570d4..db239f833136 100644
Library("crc32c_gn")
diff --git third_party/libwebrtc/net/dcsctp/packet/data_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/data_gn/moz.build
-index 3ef5d5be2245..b91e78705eae 100644
+index 1c7b585c2926..6c8a16c55f90 100644
--- third_party/libwebrtc/net/dcsctp/packet/data_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/packet/data_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -77700,6 +71225,7 @@ index 3ef5d5be2245..b91e78705eae 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -77708,13 +71234,12 @@ index 3ef5d5be2245..b91e78705eae 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -77753,7 +71278,6 @@ index 3ef5d5be2245..b91e78705eae 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -77803,7 +71327,7 @@ index 3ef5d5be2245..b91e78705eae 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -77829,7 +71353,7 @@ index 3ef5d5be2245..b91e78705eae 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -77871,18 +71395,10 @@ index 3ef5d5be2245..b91e78705eae 100644
-
Library("data_gn")
diff --git third_party/libwebrtc/net/dcsctp/packet/error_cause_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/error_cause_gn/moz.build
-index 1d3785220850..ec47f54be732 100644
+index b905fa35f1fe..0746b390cdbd 100644
--- third_party/libwebrtc/net/dcsctp/packet/error_cause_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/packet/error_cause_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -77890,6 +71406,7 @@ index 1d3785220850..ec47f54be732 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -77898,23 +71415,18 @@ index 1d3785220850..ec47f54be732 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -59,114 +72,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -59,93 +68,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -77933,10 +71445,6 @@ index 1d3785220850..ec47f54be732 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -77944,10 +71452,6 @@ index 1d3785220850..ec47f54be732 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -77955,7 +71459,6 @@ index 1d3785220850..ec47f54be732 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -77963,10 +71466,6 @@ index 1d3785220850..ec47f54be732 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -77979,10 +71478,6 @@ index 1d3785220850..ec47f54be732 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -78020,7 +71515,7 @@ index 1d3785220850..ec47f54be732 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -174,82 +80,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -153,82 +76,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -78078,10 +71573,10 @@ index 1d3785220850..ec47f54be732 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -78092,10 +71587,10 @@ index 1d3785220850..ec47f54be732 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -78107,18 +71602,10 @@ index 1d3785220850..ec47f54be732 100644
Library("error_cause_gn")
diff --git third_party/libwebrtc/net/dcsctp/packet/parameter_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/parameter_gn/moz.build
-index e5a260ffa359..4a9be3392a92 100644
+index 287f439c6c0f..a7fcad364e6e 100644
--- third_party/libwebrtc/net/dcsctp/packet/parameter_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/packet/parameter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -78126,6 +71613,7 @@ index e5a260ffa359..4a9be3392a92 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -78134,23 +71622,18 @@ index e5a260ffa359..4a9be3392a92 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -57,114 +70,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -57,93 +66,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -78169,10 +71652,6 @@ index e5a260ffa359..4a9be3392a92 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -78180,10 +71659,6 @@ index e5a260ffa359..4a9be3392a92 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -78191,7 +71666,6 @@ index e5a260ffa359..4a9be3392a92 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -78199,10 +71673,6 @@ index e5a260ffa359..4a9be3392a92 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -78215,10 +71685,6 @@ index e5a260ffa359..4a9be3392a92 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -78256,7 +71722,7 @@ index e5a260ffa359..4a9be3392a92 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -172,82 +78,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -151,82 +74,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -78314,10 +71780,10 @@ index e5a260ffa359..4a9be3392a92 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -78328,10 +71794,10 @@ index e5a260ffa359..4a9be3392a92 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -78343,18 +71809,10 @@ index e5a260ffa359..4a9be3392a92 100644
Library("parameter_gn")
diff --git third_party/libwebrtc/net/dcsctp/packet/sctp_packet_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/sctp_packet_gn/moz.build
-index 497644154760..c751dbbcf49b 100644
+index 58f18e34123b..d40508c6cbb6 100644
--- third_party/libwebrtc/net/dcsctp/packet/sctp_packet_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/packet/sctp_packet_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -78362,6 +71820,7 @@ index 497644154760..c751dbbcf49b 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -78370,23 +71829,18 @@ index 497644154760..c751dbbcf49b 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -78405,10 +71859,6 @@ index 497644154760..c751dbbcf49b 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -78416,10 +71866,6 @@ index 497644154760..c751dbbcf49b 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -78427,7 +71873,6 @@ index 497644154760..c751dbbcf49b 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -78435,10 +71880,6 @@ index 497644154760..c751dbbcf49b 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -78451,10 +71892,6 @@ index 497644154760..c751dbbcf49b 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -78492,7 +71929,7 @@ index 497644154760..c751dbbcf49b 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -78550,10 +71987,10 @@ index 497644154760..c751dbbcf49b 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -78564,10 +72001,10 @@ index 497644154760..c751dbbcf49b 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -78579,18 +72016,10 @@ index 497644154760..c751dbbcf49b 100644
Library("sctp_packet_gn")
diff --git third_party/libwebrtc/net/dcsctp/packet/tlv_trait_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/tlv_trait_gn/moz.build
-index 64e98c0ca8fb..3d1be257fd74 100644
+index 102e2a7ffedc..01ec317b6b9e 100644
--- third_party/libwebrtc/net/dcsctp/packet/tlv_trait_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/packet/tlv_trait_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -78598,6 +72027,7 @@ index 64e98c0ca8fb..3d1be257fd74 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -78606,23 +72036,18 @@ index 64e98c0ca8fb..3d1be257fd74 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -78641,10 +72066,6 @@ index 64e98c0ca8fb..3d1be257fd74 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -78652,10 +72073,6 @@ index 64e98c0ca8fb..3d1be257fd74 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -78663,7 +72080,6 @@ index 64e98c0ca8fb..3d1be257fd74 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -78671,10 +72087,6 @@ index 64e98c0ca8fb..3d1be257fd74 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -78687,10 +72099,6 @@ index 64e98c0ca8fb..3d1be257fd74 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -78728,7 +72136,7 @@ index 64e98c0ca8fb..3d1be257fd74 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -78786,10 +72194,10 @@ index 64e98c0ca8fb..3d1be257fd74 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -78800,10 +72208,10 @@ index 64e98c0ca8fb..3d1be257fd74 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -78815,18 +72223,10 @@ index 64e98c0ca8fb..3d1be257fd74 100644
Library("tlv_trait_gn")
diff --git third_party/libwebrtc/net/dcsctp/public/factory_gn/moz.build third_party/libwebrtc/net/dcsctp/public/factory_gn/moz.build
-index 5afb501a0c06..d9b4e05ede8e 100644
+index ec8ad25e6576..88e84b3e84a8 100644
--- third_party/libwebrtc/net/dcsctp/public/factory_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/public/factory_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -78834,6 +72234,7 @@ index 5afb501a0c06..d9b4e05ede8e 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -78842,23 +72243,18 @@ index 5afb501a0c06..d9b4e05ede8e 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -78877,10 +72273,6 @@ index 5afb501a0c06..d9b4e05ede8e 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -78888,10 +72280,6 @@ index 5afb501a0c06..d9b4e05ede8e 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -78899,7 +72287,6 @@ index 5afb501a0c06..d9b4e05ede8e 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -78907,10 +72294,6 @@ index 5afb501a0c06..d9b4e05ede8e 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -78923,10 +72306,6 @@ index 5afb501a0c06..d9b4e05ede8e 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -78964,7 +72343,7 @@ index 5afb501a0c06..d9b4e05ede8e 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -79022,10 +72401,10 @@ index 5afb501a0c06..d9b4e05ede8e 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -79036,10 +72415,10 @@ index 5afb501a0c06..d9b4e05ede8e 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -79051,18 +72430,10 @@ index 5afb501a0c06..d9b4e05ede8e 100644
Library("factory_gn")
diff --git third_party/libwebrtc/net/dcsctp/public/socket_gn/moz.build third_party/libwebrtc/net/dcsctp/public/socket_gn/moz.build
-index 2ceda860f068..f857b7e881b6 100644
+index f6bde482dd40..db4159f8c467 100644
--- third_party/libwebrtc/net/dcsctp/public/socket_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/public/socket_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -79070,6 +72441,7 @@ index 2ceda860f068..f857b7e881b6 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -79078,23 +72450,18 @@ index 2ceda860f068..f857b7e881b6 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -79113,10 +72480,6 @@ index 2ceda860f068..f857b7e881b6 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -79124,10 +72487,6 @@ index 2ceda860f068..f857b7e881b6 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -79135,7 +72494,6 @@ index 2ceda860f068..f857b7e881b6 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -79143,10 +72501,6 @@ index 2ceda860f068..f857b7e881b6 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -79159,10 +72513,6 @@ index 2ceda860f068..f857b7e881b6 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -79193,7 +72543,7 @@ index 2ceda860f068..f857b7e881b6 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -79280,7 +72630,7 @@ index 2ceda860f068..f857b7e881b6 100644
Library("socket_gn")
diff --git third_party/libwebrtc/net/dcsctp/public/types_gn/moz.build third_party/libwebrtc/net/dcsctp/public/types_gn/moz.build
-index 084e64708b47..e2eaa506a512 100644
+index ec5c0d8b1d8e..b63c73c26ce7 100644
--- third_party/libwebrtc/net/dcsctp/public/types_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/public/types_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -79291,6 +72641,7 @@ index 084e64708b47..e2eaa506a512 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -79299,13 +72650,12 @@ index 084e64708b47..e2eaa506a512 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -79344,7 +72694,6 @@ index 084e64708b47..e2eaa506a512 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -79394,7 +72743,7 @@ index 084e64708b47..e2eaa506a512 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -79420,7 +72769,7 @@ index 084e64708b47..e2eaa506a512 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -79462,18 +72811,10 @@ index 084e64708b47..e2eaa506a512 100644
-
Library("types_gn")
diff --git third_party/libwebrtc/net/dcsctp/rx/data_tracker_gn/moz.build third_party/libwebrtc/net/dcsctp/rx/data_tracker_gn/moz.build
-index bb12bb01f5b3..7be6e26f56f8 100644
+index 2f36a17ef96e..42cdf1668378 100644
--- third_party/libwebrtc/net/dcsctp/rx/data_tracker_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/rx/data_tracker_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -79481,6 +72822,7 @@ index bb12bb01f5b3..7be6e26f56f8 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -79489,23 +72831,18 @@ index bb12bb01f5b3..7be6e26f56f8 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -79524,10 +72861,6 @@ index bb12bb01f5b3..7be6e26f56f8 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -79535,10 +72868,6 @@ index bb12bb01f5b3..7be6e26f56f8 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -79546,7 +72875,6 @@ index bb12bb01f5b3..7be6e26f56f8 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -79554,10 +72882,6 @@ index bb12bb01f5b3..7be6e26f56f8 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -79570,10 +72894,6 @@ index bb12bb01f5b3..7be6e26f56f8 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -79611,7 +72931,7 @@ index bb12bb01f5b3..7be6e26f56f8 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -79669,10 +72989,10 @@ index bb12bb01f5b3..7be6e26f56f8 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -79683,10 +73003,10 @@ index bb12bb01f5b3..7be6e26f56f8 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -79698,18 +73018,10 @@ index bb12bb01f5b3..7be6e26f56f8 100644
Library("data_tracker_gn")
diff --git third_party/libwebrtc/net/dcsctp/rx/interleaved_reassembly_streams_gn/moz.build third_party/libwebrtc/net/dcsctp/rx/interleaved_reassembly_streams_gn/moz.build
-index 7379d0595fd1..29075c722d09 100644
+index 01fdbebef3f1..78750a2c45d7 100644
--- third_party/libwebrtc/net/dcsctp/rx/interleaved_reassembly_streams_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/rx/interleaved_reassembly_streams_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -79717,6 +73029,7 @@ index 7379d0595fd1..29075c722d09 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -79725,23 +73038,18 @@ index 7379d0595fd1..29075c722d09 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -79760,10 +73068,6 @@ index 7379d0595fd1..29075c722d09 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -79771,10 +73075,6 @@ index 7379d0595fd1..29075c722d09 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -79782,7 +73082,6 @@ index 7379d0595fd1..29075c722d09 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -79790,10 +73089,6 @@ index 7379d0595fd1..29075c722d09 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -79806,10 +73101,6 @@ index 7379d0595fd1..29075c722d09 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -79847,7 +73138,7 @@ index 7379d0595fd1..29075c722d09 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -79905,10 +73196,10 @@ index 7379d0595fd1..29075c722d09 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -79919,10 +73210,10 @@ index 7379d0595fd1..29075c722d09 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -79934,18 +73225,10 @@ index 7379d0595fd1..29075c722d09 100644
Library("interleaved_reassembly_streams_gn")
diff --git third_party/libwebrtc/net/dcsctp/rx/reassembly_queue_gn/moz.build third_party/libwebrtc/net/dcsctp/rx/reassembly_queue_gn/moz.build
-index f0f07f920293..ee0b8fa5952b 100644
+index abb5e61463bb..ca8b574b754c 100644
--- third_party/libwebrtc/net/dcsctp/rx/reassembly_queue_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/rx/reassembly_queue_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -79953,6 +73236,7 @@ index f0f07f920293..ee0b8fa5952b 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -79961,23 +73245,18 @@ index f0f07f920293..ee0b8fa5952b 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -79996,10 +73275,6 @@ index f0f07f920293..ee0b8fa5952b 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -80007,10 +73282,6 @@ index f0f07f920293..ee0b8fa5952b 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -80018,7 +73289,6 @@ index f0f07f920293..ee0b8fa5952b 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -80026,10 +73296,6 @@ index f0f07f920293..ee0b8fa5952b 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -80042,10 +73308,6 @@ index f0f07f920293..ee0b8fa5952b 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -80083,7 +73345,7 @@ index f0f07f920293..ee0b8fa5952b 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -80141,10 +73403,10 @@ index f0f07f920293..ee0b8fa5952b 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -80155,10 +73417,10 @@ index f0f07f920293..ee0b8fa5952b 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -80170,7 +73432,7 @@ index f0f07f920293..ee0b8fa5952b 100644
Library("reassembly_queue_gn")
diff --git third_party/libwebrtc/net/dcsctp/rx/reassembly_streams_gn/moz.build third_party/libwebrtc/net/dcsctp/rx/reassembly_streams_gn/moz.build
-index 5057e44341e3..8c1f046755a3 100644
+index 5c644b5665bd..d1b59bdd2da1 100644
--- third_party/libwebrtc/net/dcsctp/rx/reassembly_streams_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/rx/reassembly_streams_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -80181,6 +73443,7 @@ index 5057e44341e3..8c1f046755a3 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -80189,13 +73452,12 @@ index 5057e44341e3..8c1f046755a3 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -80234,7 +73496,6 @@ index 5057e44341e3..8c1f046755a3 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -80291,7 +73552,7 @@ index 5057e44341e3..8c1f046755a3 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -80317,7 +73578,7 @@ index 5057e44341e3..8c1f046755a3 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -80359,18 +73620,10 @@ index 5057e44341e3..8c1f046755a3 100644
-
Library("reassembly_streams_gn")
diff --git third_party/libwebrtc/net/dcsctp/rx/traditional_reassembly_streams_gn/moz.build third_party/libwebrtc/net/dcsctp/rx/traditional_reassembly_streams_gn/moz.build
-index a2c6dca5eb60..80e4fb36c493 100644
+index b60265ff2dec..10b2024e6c32 100644
--- third_party/libwebrtc/net/dcsctp/rx/traditional_reassembly_streams_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/rx/traditional_reassembly_streams_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -80378,6 +73631,7 @@ index a2c6dca5eb60..80e4fb36c493 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -80386,23 +73640,18 @@ index a2c6dca5eb60..80e4fb36c493 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -80421,10 +73670,6 @@ index a2c6dca5eb60..80e4fb36c493 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -80432,10 +73677,6 @@ index a2c6dca5eb60..80e4fb36c493 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -80443,7 +73684,6 @@ index a2c6dca5eb60..80e4fb36c493 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -80451,10 +73691,6 @@ index a2c6dca5eb60..80e4fb36c493 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -80467,10 +73703,6 @@ index a2c6dca5eb60..80e4fb36c493 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -80508,7 +73740,7 @@ index a2c6dca5eb60..80e4fb36c493 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -80566,10 +73798,10 @@ index a2c6dca5eb60..80e4fb36c493 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -80580,10 +73812,10 @@ index a2c6dca5eb60..80e4fb36c493 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -80595,7 +73827,7 @@ index a2c6dca5eb60..80e4fb36c493 100644
Library("traditional_reassembly_streams_gn")
diff --git third_party/libwebrtc/net/dcsctp/socket/context_gn/moz.build third_party/libwebrtc/net/dcsctp/socket/context_gn/moz.build
-index c1b83a46abe3..14cd41f96e4f 100644
+index c5353dc2fcc8..34abeccb759b 100644
--- third_party/libwebrtc/net/dcsctp/socket/context_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/socket/context_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -80606,6 +73838,7 @@ index c1b83a46abe3..14cd41f96e4f 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -80614,13 +73847,12 @@ index c1b83a46abe3..14cd41f96e4f 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -80659,7 +73891,6 @@ index c1b83a46abe3..14cd41f96e4f 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -80716,7 +73947,7 @@ index c1b83a46abe3..14cd41f96e4f 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -80742,7 +73973,7 @@ index c1b83a46abe3..14cd41f96e4f 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -80784,18 +74015,10 @@ index c1b83a46abe3..14cd41f96e4f 100644
-
Library("context_gn")
diff --git third_party/libwebrtc/net/dcsctp/socket/dcsctp_socket_gn/moz.build third_party/libwebrtc/net/dcsctp/socket/dcsctp_socket_gn/moz.build
-index 29a04e5ca135..0cf2728346df 100644
+index bc87aa461b0d..4ae0b2d6bff5 100644
--- third_party/libwebrtc/net/dcsctp/socket/dcsctp_socket_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/socket/dcsctp_socket_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -80803,6 +74026,7 @@ index 29a04e5ca135..0cf2728346df 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -80811,23 +74035,18 @@ index 29a04e5ca135..0cf2728346df 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -48,114 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -80846,10 +74065,6 @@ index 29a04e5ca135..0cf2728346df 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -80857,10 +74072,6 @@ index 29a04e5ca135..0cf2728346df 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -80868,7 +74079,6 @@ index 29a04e5ca135..0cf2728346df 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -80876,10 +74086,6 @@ index 29a04e5ca135..0cf2728346df 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -80892,10 +74098,6 @@ index 29a04e5ca135..0cf2728346df 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -80933,7 +74135,7 @@ index 29a04e5ca135..0cf2728346df 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -163,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -80991,10 +74193,10 @@ index 29a04e5ca135..0cf2728346df 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -81005,10 +74207,10 @@ index 29a04e5ca135..0cf2728346df 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -81020,18 +74222,10 @@ index 29a04e5ca135..0cf2728346df 100644
Library("dcsctp_socket_gn")
diff --git third_party/libwebrtc/net/dcsctp/socket/heartbeat_handler_gn/moz.build third_party/libwebrtc/net/dcsctp/socket/heartbeat_handler_gn/moz.build
-index 66c34162b8dc..fdf1bbb890a5 100644
+index 4106ee13d217..a3f8705427b1 100644
--- third_party/libwebrtc/net/dcsctp/socket/heartbeat_handler_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/socket/heartbeat_handler_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -81039,6 +74233,7 @@ index 66c34162b8dc..fdf1bbb890a5 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -81047,23 +74242,18 @@ index 66c34162b8dc..fdf1bbb890a5 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -81082,10 +74272,6 @@ index 66c34162b8dc..fdf1bbb890a5 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -81093,10 +74279,6 @@ index 66c34162b8dc..fdf1bbb890a5 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -81104,7 +74286,6 @@ index 66c34162b8dc..fdf1bbb890a5 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -81112,10 +74293,6 @@ index 66c34162b8dc..fdf1bbb890a5 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -81128,10 +74305,6 @@ index 66c34162b8dc..fdf1bbb890a5 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -81169,7 +74342,7 @@ index 66c34162b8dc..fdf1bbb890a5 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -81227,10 +74400,10 @@ index 66c34162b8dc..fdf1bbb890a5 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -81241,10 +74414,10 @@ index 66c34162b8dc..fdf1bbb890a5 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -81256,18 +74429,10 @@ index 66c34162b8dc..fdf1bbb890a5 100644
Library("heartbeat_handler_gn")
diff --git third_party/libwebrtc/net/dcsctp/socket/packet_sender_gn/moz.build third_party/libwebrtc/net/dcsctp/socket/packet_sender_gn/moz.build
-index 00f7f6e1def2..c31b3ee4cc2d 100644
+index c900f2fd9491..70830cfb07de 100644
--- third_party/libwebrtc/net/dcsctp/socket/packet_sender_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/socket/packet_sender_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -81275,6 +74440,7 @@ index 00f7f6e1def2..c31b3ee4cc2d 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -81283,23 +74449,18 @@ index 00f7f6e1def2..c31b3ee4cc2d 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -81318,10 +74479,6 @@ index 00f7f6e1def2..c31b3ee4cc2d 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -81329,10 +74486,6 @@ index 00f7f6e1def2..c31b3ee4cc2d 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -81340,7 +74493,6 @@ index 00f7f6e1def2..c31b3ee4cc2d 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -81348,10 +74500,6 @@ index 00f7f6e1def2..c31b3ee4cc2d 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -81364,10 +74512,6 @@ index 00f7f6e1def2..c31b3ee4cc2d 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -81405,7 +74549,7 @@ index 00f7f6e1def2..c31b3ee4cc2d 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -81463,10 +74607,10 @@ index 00f7f6e1def2..c31b3ee4cc2d 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -81477,10 +74621,10 @@ index 00f7f6e1def2..c31b3ee4cc2d 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -81492,18 +74636,10 @@ index 00f7f6e1def2..c31b3ee4cc2d 100644
Library("packet_sender_gn")
diff --git third_party/libwebrtc/net/dcsctp/socket/stream_reset_handler_gn/moz.build third_party/libwebrtc/net/dcsctp/socket/stream_reset_handler_gn/moz.build
-index 3b8899da3266..5532a14e5bda 100644
+index 737f639236a3..e5f4c3f7489a 100644
--- third_party/libwebrtc/net/dcsctp/socket/stream_reset_handler_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/socket/stream_reset_handler_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -81511,6 +74647,7 @@ index 3b8899da3266..5532a14e5bda 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -81519,23 +74656,18 @@ index 3b8899da3266..5532a14e5bda 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -81554,10 +74686,6 @@ index 3b8899da3266..5532a14e5bda 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -81565,10 +74693,6 @@ index 3b8899da3266..5532a14e5bda 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -81576,7 +74700,6 @@ index 3b8899da3266..5532a14e5bda 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -81584,10 +74707,6 @@ index 3b8899da3266..5532a14e5bda 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -81600,10 +74719,6 @@ index 3b8899da3266..5532a14e5bda 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -81641,7 +74756,7 @@ index 3b8899da3266..5532a14e5bda 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -81699,10 +74814,10 @@ index 3b8899da3266..5532a14e5bda 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -81713,10 +74828,10 @@ index 3b8899da3266..5532a14e5bda 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -81728,18 +74843,10 @@ index 3b8899da3266..5532a14e5bda 100644
Library("stream_reset_handler_gn")
diff --git third_party/libwebrtc/net/dcsctp/socket/transmission_control_block_gn/moz.build third_party/libwebrtc/net/dcsctp/socket/transmission_control_block_gn/moz.build
-index ef3e5cdff066..5b3a5af9aba8 100644
+index f9cd1cdea19c..96f1c1bf0f2c 100644
--- third_party/libwebrtc/net/dcsctp/socket/transmission_control_block_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/socket/transmission_control_block_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -81747,6 +74854,7 @@ index ef3e5cdff066..5b3a5af9aba8 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -81755,23 +74863,18 @@ index ef3e5cdff066..5b3a5af9aba8 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -81790,10 +74893,6 @@ index ef3e5cdff066..5b3a5af9aba8 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -81801,10 +74900,6 @@ index ef3e5cdff066..5b3a5af9aba8 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -81812,7 +74907,6 @@ index ef3e5cdff066..5b3a5af9aba8 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -81820,10 +74914,6 @@ index ef3e5cdff066..5b3a5af9aba8 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -81836,10 +74926,6 @@ index ef3e5cdff066..5b3a5af9aba8 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -81877,7 +74963,7 @@ index ef3e5cdff066..5b3a5af9aba8 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -81935,10 +75021,10 @@ index ef3e5cdff066..5b3a5af9aba8 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -81949,10 +75035,10 @@ index ef3e5cdff066..5b3a5af9aba8 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -81964,18 +75050,10 @@ index ef3e5cdff066..5b3a5af9aba8 100644
Library("transmission_control_block_gn")
diff --git third_party/libwebrtc/net/dcsctp/timer/task_queue_timeout_gn/moz.build third_party/libwebrtc/net/dcsctp/timer/task_queue_timeout_gn/moz.build
-index c42f501ab5b8..17aff1a85181 100644
+index 6fcab1231d30..5c9317afe4d3 100644
--- third_party/libwebrtc/net/dcsctp/timer/task_queue_timeout_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/timer/task_queue_timeout_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -81983,6 +75061,7 @@ index c42f501ab5b8..17aff1a85181 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -81991,23 +75070,18 @@ index c42f501ab5b8..17aff1a85181 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -82026,10 +75100,6 @@ index c42f501ab5b8..17aff1a85181 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -82037,10 +75107,6 @@ index c42f501ab5b8..17aff1a85181 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -82048,7 +75114,6 @@ index c42f501ab5b8..17aff1a85181 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -82056,10 +75121,6 @@ index c42f501ab5b8..17aff1a85181 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -82072,10 +75133,6 @@ index c42f501ab5b8..17aff1a85181 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -82113,7 +75170,7 @@ index c42f501ab5b8..17aff1a85181 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -82171,10 +75228,10 @@ index c42f501ab5b8..17aff1a85181 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -82185,10 +75242,10 @@ index c42f501ab5b8..17aff1a85181 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -82200,18 +75257,10 @@ index c42f501ab5b8..17aff1a85181 100644
Library("task_queue_timeout_gn")
diff --git third_party/libwebrtc/net/dcsctp/timer/timer_gn/moz.build third_party/libwebrtc/net/dcsctp/timer/timer_gn/moz.build
-index 1739ac8b4ef0..410e23eda3c3 100644
+index df73a1896e86..719a013e1786 100644
--- third_party/libwebrtc/net/dcsctp/timer/timer_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/timer/timer_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -82219,6 +75268,7 @@ index 1739ac8b4ef0..410e23eda3c3 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -82227,23 +75277,18 @@ index 1739ac8b4ef0..410e23eda3c3 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -82262,10 +75307,6 @@ index 1739ac8b4ef0..410e23eda3c3 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -82273,10 +75314,6 @@ index 1739ac8b4ef0..410e23eda3c3 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -82284,7 +75321,6 @@ index 1739ac8b4ef0..410e23eda3c3 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -82292,10 +75328,6 @@ index 1739ac8b4ef0..410e23eda3c3 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -82308,10 +75340,6 @@ index 1739ac8b4ef0..410e23eda3c3 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -82342,7 +75370,7 @@ index 1739ac8b4ef0..410e23eda3c3 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -82429,18 +75457,10 @@ index 1739ac8b4ef0..410e23eda3c3 100644
Library("timer_gn")
diff --git third_party/libwebrtc/net/dcsctp/tx/outstanding_data_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/outstanding_data_gn/moz.build
-index e85dc4592bf1..c2c7420b0893 100644
+index df2340a8c348..3451c619b955 100644
--- third_party/libwebrtc/net/dcsctp/tx/outstanding_data_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/tx/outstanding_data_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -82448,6 +75468,7 @@ index e85dc4592bf1..c2c7420b0893 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -82456,23 +75477,18 @@ index e85dc4592bf1..c2c7420b0893 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -82491,10 +75507,6 @@ index e85dc4592bf1..c2c7420b0893 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -82502,10 +75514,6 @@ index e85dc4592bf1..c2c7420b0893 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -82513,7 +75521,6 @@ index e85dc4592bf1..c2c7420b0893 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -82521,10 +75528,6 @@ index e85dc4592bf1..c2c7420b0893 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -82537,10 +75540,6 @@ index e85dc4592bf1..c2c7420b0893 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -82578,7 +75577,7 @@ index e85dc4592bf1..c2c7420b0893 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -82636,10 +75635,10 @@ index e85dc4592bf1..c2c7420b0893 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -82650,10 +75649,10 @@ index e85dc4592bf1..c2c7420b0893 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -82665,18 +75664,10 @@ index e85dc4592bf1..c2c7420b0893 100644
Library("outstanding_data_gn")
diff --git third_party/libwebrtc/net/dcsctp/tx/retransmission_error_counter_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/retransmission_error_counter_gn/moz.build
-index e1ae0824a880..672690c7125d 100644
+index 24095b9b7822..89c34a2b8d23 100644
--- third_party/libwebrtc/net/dcsctp/tx/retransmission_error_counter_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/tx/retransmission_error_counter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -82684,6 +75675,7 @@ index e1ae0824a880..672690c7125d 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -82692,23 +75684,18 @@ index e1ae0824a880..672690c7125d 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -82727,10 +75714,6 @@ index e1ae0824a880..672690c7125d 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -82738,10 +75721,6 @@ index e1ae0824a880..672690c7125d 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -82749,7 +75728,6 @@ index e1ae0824a880..672690c7125d 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -82757,10 +75735,6 @@ index e1ae0824a880..672690c7125d 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -82773,10 +75747,6 @@ index e1ae0824a880..672690c7125d 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -82814,7 +75784,7 @@ index e1ae0824a880..672690c7125d 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -82872,10 +75842,10 @@ index e1ae0824a880..672690c7125d 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -82886,10 +75856,10 @@ index e1ae0824a880..672690c7125d 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -82901,18 +75871,10 @@ index e1ae0824a880..672690c7125d 100644
Library("retransmission_error_counter_gn")
diff --git third_party/libwebrtc/net/dcsctp/tx/retransmission_queue_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/retransmission_queue_gn/moz.build
-index 543fd767cc65..292597d1de09 100644
+index d79764e11a90..2265d6f5a636 100644
--- third_party/libwebrtc/net/dcsctp/tx/retransmission_queue_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/tx/retransmission_queue_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -82920,6 +75882,7 @@ index 543fd767cc65..292597d1de09 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -82928,23 +75891,18 @@ index 543fd767cc65..292597d1de09 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -82963,10 +75921,6 @@ index 543fd767cc65..292597d1de09 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -82974,10 +75928,6 @@ index 543fd767cc65..292597d1de09 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -82985,7 +75935,6 @@ index 543fd767cc65..292597d1de09 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -82993,10 +75942,6 @@ index 543fd767cc65..292597d1de09 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -83009,10 +75954,6 @@ index 543fd767cc65..292597d1de09 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -83050,7 +75991,7 @@ index 543fd767cc65..292597d1de09 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -83108,10 +76049,10 @@ index 543fd767cc65..292597d1de09 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -83122,10 +76063,10 @@ index 543fd767cc65..292597d1de09 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -83137,18 +76078,10 @@ index 543fd767cc65..292597d1de09 100644
Library("retransmission_queue_gn")
diff --git third_party/libwebrtc/net/dcsctp/tx/retransmission_timeout_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/retransmission_timeout_gn/moz.build
-index b0bd600462ba..7e3b4fdbd0a3 100644
+index 01617b6f94ad..4ea9e30a8326 100644
--- third_party/libwebrtc/net/dcsctp/tx/retransmission_timeout_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/tx/retransmission_timeout_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -83156,6 +76089,7 @@ index b0bd600462ba..7e3b4fdbd0a3 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -83164,23 +76098,18 @@ index b0bd600462ba..7e3b4fdbd0a3 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -83199,10 +76128,6 @@ index b0bd600462ba..7e3b4fdbd0a3 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -83210,10 +76135,6 @@ index b0bd600462ba..7e3b4fdbd0a3 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -83221,7 +76142,6 @@ index b0bd600462ba..7e3b4fdbd0a3 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -83229,10 +76149,6 @@ index b0bd600462ba..7e3b4fdbd0a3 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -83245,10 +76161,6 @@ index b0bd600462ba..7e3b4fdbd0a3 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -83279,7 +76191,7 @@ index b0bd600462ba..7e3b4fdbd0a3 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -83366,18 +76278,10 @@ index b0bd600462ba..7e3b4fdbd0a3 100644
Library("retransmission_timeout_gn")
diff --git third_party/libwebrtc/net/dcsctp/tx/rr_send_queue_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/rr_send_queue_gn/moz.build
-index 828c2ae923b9..e612eaa591aa 100644
+index 2b0975a91d11..241a5bce6bed 100644
--- third_party/libwebrtc/net/dcsctp/tx/rr_send_queue_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/tx/rr_send_queue_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -83385,6 +76289,7 @@ index 828c2ae923b9..e612eaa591aa 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -83393,23 +76298,18 @@ index 828c2ae923b9..e612eaa591aa 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -83428,10 +76328,6 @@ index 828c2ae923b9..e612eaa591aa 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -83439,10 +76335,6 @@ index 828c2ae923b9..e612eaa591aa 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -83450,7 +76342,6 @@ index 828c2ae923b9..e612eaa591aa 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -83458,10 +76349,6 @@ index 828c2ae923b9..e612eaa591aa 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -83474,10 +76361,6 @@ index 828c2ae923b9..e612eaa591aa 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -83515,7 +76398,7 @@ index 828c2ae923b9..e612eaa591aa 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -83573,10 +76456,10 @@ index 828c2ae923b9..e612eaa591aa 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -83587,10 +76470,10 @@ index 828c2ae923b9..e612eaa591aa 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -83602,7 +76485,7 @@ index 828c2ae923b9..e612eaa591aa 100644
Library("rr_send_queue_gn")
diff --git third_party/libwebrtc/net/dcsctp/tx/send_queue_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/send_queue_gn/moz.build
-index 5aab21126b8d..dc4ce43eaf02 100644
+index a30ad32cc439..bf96c2aa78be 100644
--- third_party/libwebrtc/net/dcsctp/tx/send_queue_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/tx/send_queue_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -83613,6 +76496,7 @@ index 5aab21126b8d..dc4ce43eaf02 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -83621,13 +76505,12 @@ index 5aab21126b8d..dc4ce43eaf02 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -83666,7 +76549,6 @@ index 5aab21126b8d..dc4ce43eaf02 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -83723,7 +76605,7 @@ index 5aab21126b8d..dc4ce43eaf02 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -83749,7 +76631,7 @@ index 5aab21126b8d..dc4ce43eaf02 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -83791,18 +76673,10 @@ index 5aab21126b8d..dc4ce43eaf02 100644
-
Library("send_queue_gn")
diff --git third_party/libwebrtc/net/dcsctp/tx/stream_scheduler_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/stream_scheduler_gn/moz.build
-index 229e9ffdb1d5..9dcd4136cd05 100644
+index 5452a33e24a7..391eee8efa91 100644
--- third_party/libwebrtc/net/dcsctp/tx/stream_scheduler_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/tx/stream_scheduler_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -83810,6 +76684,7 @@ index 229e9ffdb1d5..9dcd4136cd05 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -83818,23 +76693,18 @@ index 229e9ffdb1d5..9dcd4136cd05 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -83853,10 +76723,6 @@ index 229e9ffdb1d5..9dcd4136cd05 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -83864,10 +76730,6 @@ index 229e9ffdb1d5..9dcd4136cd05 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -83875,7 +76737,6 @@ index 229e9ffdb1d5..9dcd4136cd05 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -83883,10 +76744,6 @@ index 229e9ffdb1d5..9dcd4136cd05 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -83899,10 +76756,6 @@ index 229e9ffdb1d5..9dcd4136cd05 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -83940,7 +76793,7 @@ index 229e9ffdb1d5..9dcd4136cd05 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -83998,10 +76851,10 @@ index 229e9ffdb1d5..9dcd4136cd05 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -84012,10 +76865,10 @@ index 229e9ffdb1d5..9dcd4136cd05 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -84027,18 +76880,10 @@ index 229e9ffdb1d5..9dcd4136cd05 100644
Library("stream_scheduler_gn")
diff --git third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build
-index 4680b8038c15..11a5835aa0ec 100644
+index 1a25bc4c9c08..88ed8df84a75 100644
--- third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build
+++ third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -84046,6 +76891,7 @@ index 4680b8038c15..11a5835aa0ec 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -84054,23 +76900,18 @@ index 4680b8038c15..11a5835aa0ec 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -84090,10 +76931,6 @@ index 4680b8038c15..11a5835aa0ec 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -84101,10 +76938,6 @@ index 4680b8038c15..11a5835aa0ec 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -84112,7 +76945,6 @@ index 4680b8038c15..11a5835aa0ec 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -84120,10 +76952,6 @@ index 4680b8038c15..11a5835aa0ec 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -84136,10 +76964,6 @@ index 4680b8038c15..11a5835aa0ec 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -84177,7 +77001,7 @@ index 4680b8038c15..11a5835aa0ec 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -84235,10 +77059,10 @@ index 4680b8038c15..11a5835aa0ec 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -84249,10 +77073,10 @@ index 4680b8038c15..11a5835aa0ec 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -84264,7 +77088,7 @@ index 4680b8038c15..11a5835aa0ec 100644
Library("async_dns_resolver_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 84ac167bbdb4..9add7df57b49 100644
+index be56799b7857..0297bad15075 100644
--- third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
+++ third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -84275,6 +77099,7 @@ index 84ac167bbdb4..9add7df57b49 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -84283,13 +77108,12 @@ index 84ac167bbdb4..9add7df57b49 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -84324,7 +77148,6 @@ index 84ac167bbdb4..9add7df57b49 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -84374,7 +77197,7 @@ index 84ac167bbdb4..9add7df57b49 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -84400,7 +77223,7 @@ index 84ac167bbdb4..9add7df57b49 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -84442,18 +77265,10 @@ index 84ac167bbdb4..9add7df57b49 100644
-
Library("async_packet_socket_gn")
diff --git third_party/libwebrtc/rtc_base/base64_gn/moz.build third_party/libwebrtc/rtc_base/base64_gn/moz.build
-index d5290ba156ee..438d28335bbf 100644
+index d726a432a8f7..171770ac0390 100644
--- third_party/libwebrtc/rtc_base/base64_gn/moz.build
+++ third_party/libwebrtc/rtc_base/base64_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -84461,6 +77276,7 @@ index d5290ba156ee..438d28335bbf 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -84469,23 +77285,18 @@ index d5290ba156ee..438d28335bbf 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -84504,10 +77315,6 @@ index d5290ba156ee..438d28335bbf 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -84515,10 +77322,6 @@ index d5290ba156ee..438d28335bbf 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -84526,7 +77329,6 @@ index d5290ba156ee..438d28335bbf 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -84534,10 +77336,6 @@ index d5290ba156ee..438d28335bbf 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -84550,10 +77348,6 @@ index d5290ba156ee..438d28335bbf 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -84584,7 +77378,7 @@ index d5290ba156ee..438d28335bbf 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -84671,18 +77465,10 @@ index d5290ba156ee..438d28335bbf 100644
Library("base64_gn")
diff --git third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
-index 80ddb0225604..9bcacaba76c6 100644
+index 50cb2ab77aea..710d01f74d07 100644
--- third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -84690,6 +77476,7 @@ index 80ddb0225604..9bcacaba76c6 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -84698,23 +77485,18 @@ index 80ddb0225604..9bcacaba76c6 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -84733,10 +77515,6 @@ index 80ddb0225604..9bcacaba76c6 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -84744,10 +77522,6 @@ index 80ddb0225604..9bcacaba76c6 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -84755,7 +77529,6 @@ index 80ddb0225604..9bcacaba76c6 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -84763,10 +77536,6 @@ index 80ddb0225604..9bcacaba76c6 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -84779,10 +77548,6 @@ index 80ddb0225604..9bcacaba76c6 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -84813,7 +77578,7 @@ index 80ddb0225604..9bcacaba76c6 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -84900,18 +77665,10 @@ index 80ddb0225604..9bcacaba76c6 100644
Library("bit_buffer_gn")
diff --git third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build
-index 827aea8164d8..48d6a8a83d35 100644
+index b9f2220d4f48..6924940a7cf4 100644
--- third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build
+++ third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -84919,6 +77676,7 @@ index 827aea8164d8..48d6a8a83d35 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -84927,23 +77685,18 @@ index 827aea8164d8..48d6a8a83d35 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -84962,10 +77715,6 @@ index 827aea8164d8..48d6a8a83d35 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -84973,10 +77722,6 @@ index 827aea8164d8..48d6a8a83d35 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -84984,7 +77729,6 @@ index 827aea8164d8..48d6a8a83d35 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -84992,10 +77736,6 @@ index 827aea8164d8..48d6a8a83d35 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -85008,10 +77748,6 @@ index 827aea8164d8..48d6a8a83d35 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -85049,7 +77785,7 @@ index 827aea8164d8..48d6a8a83d35 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -85107,10 +77843,10 @@ index 827aea8164d8..48d6a8a83d35 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -85121,10 +77857,10 @@ index 827aea8164d8..48d6a8a83d35 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -85136,18 +77872,10 @@ index 827aea8164d8..48d6a8a83d35 100644
Library("bitrate_tracker_gn")
diff --git third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
-index 22951bbe63d7..f7117ae3f008 100644
+index 26817ca09a7d..226a24f7107e 100644
--- third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
+++ third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -85155,6 +77883,7 @@ index 22951bbe63d7..f7117ae3f008 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -85163,23 +77892,18 @@ index 22951bbe63d7..f7117ae3f008 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -85198,10 +77922,6 @@ index 22951bbe63d7..f7117ae3f008 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -85209,10 +77929,6 @@ index 22951bbe63d7..f7117ae3f008 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -85220,7 +77936,6 @@ index 22951bbe63d7..f7117ae3f008 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -85228,10 +77943,6 @@ index 22951bbe63d7..f7117ae3f008 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -85244,10 +77955,6 @@ index 22951bbe63d7..f7117ae3f008 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -85278,7 +77985,7 @@ index 22951bbe63d7..f7117ae3f008 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -85365,7 +78072,7 @@ index 22951bbe63d7..f7117ae3f008 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 1fcfe7639127..fb81a8672641 100644
+index a454fcb0ee69..2925b692abfc 100644
--- third_party/libwebrtc/rtc_base/buffer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/buffer_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -85376,6 +78083,7 @@ index 1fcfe7639127..fb81a8672641 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -85384,13 +78092,12 @@ index 1fcfe7639127..fb81a8672641 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -85429,7 +78136,6 @@ index 1fcfe7639127..fb81a8672641 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -85479,7 +78185,7 @@ index 1fcfe7639127..fb81a8672641 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -85505,7 +78211,7 @@ index 1fcfe7639127..fb81a8672641 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -85547,18 +78253,10 @@ index 1fcfe7639127..fb81a8672641 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 a3061b52e1c5..e0c40a228e26 100644
+index 23d723da5d0b..0cf3653ec23b 100644
--- third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -85566,6 +78264,7 @@ index a3061b52e1c5..e0c40a228e26 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -85574,23 +78273,18 @@ index a3061b52e1c5..e0c40a228e26 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -85609,10 +78303,6 @@ index a3061b52e1c5..e0c40a228e26 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -85620,10 +78310,6 @@ index a3061b52e1c5..e0c40a228e26 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -85631,7 +78317,6 @@ index a3061b52e1c5..e0c40a228e26 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -85639,10 +78324,6 @@ index a3061b52e1c5..e0c40a228e26 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -85655,10 +78336,6 @@ index a3061b52e1c5..e0c40a228e26 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -85689,7 +78366,7 @@ index a3061b52e1c5..e0c40a228e26 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -85776,7 +78453,7 @@ index a3061b52e1c5..e0c40a228e26 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 1545308124ab..a3ec3a3d626b 100644
+index 74f384c22bb6..0e5f9e105309 100644
--- third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
+++ third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -85787,6 +78464,7 @@ index 1545308124ab..a3ec3a3d626b 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -85795,13 +78473,12 @@ index 1545308124ab..a3ec3a3d626b 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -85836,7 +78513,6 @@ index 1545308124ab..a3ec3a3d626b 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -85886,7 +78562,7 @@ index 1545308124ab..a3ec3a3d626b 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -85912,7 +78588,7 @@ index 1545308124ab..a3ec3a3d626b 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -85954,18 +78630,10 @@ index 1545308124ab..a3ec3a3d626b 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 8d87d4d8216f..e4f306a32de0 100644
+index 8e1b70c997d0..3f23845f5297 100644
--- third_party/libwebrtc/rtc_base/checks_gn/moz.build
+++ third_party/libwebrtc/rtc_base/checks_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -85973,6 +78641,7 @@ index 8d87d4d8216f..e4f306a32de0 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -85981,23 +78650,18 @@ index 8d87d4d8216f..e4f306a32de0 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -86016,10 +78680,6 @@ index 8d87d4d8216f..e4f306a32de0 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -86027,10 +78687,6 @@ index 8d87d4d8216f..e4f306a32de0 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -86038,7 +78694,6 @@ index 8d87d4d8216f..e4f306a32de0 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -86046,10 +78701,6 @@ index 8d87d4d8216f..e4f306a32de0 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -86062,10 +78713,6 @@ index 8d87d4d8216f..e4f306a32de0 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -86096,7 +78743,7 @@ index 8d87d4d8216f..e4f306a32de0 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -86183,7 +78830,7 @@ index 8d87d4d8216f..e4f306a32de0 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 7bdfd334c9eb..fb7482f075fd 100644
+index 88cee7f44516..76da6d251187 100644
--- third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
+++ third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -86194,6 +78841,7 @@ index 7bdfd334c9eb..fb7482f075fd 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -86202,13 +78850,12 @@ index 7bdfd334c9eb..fb7482f075fd 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -86243,7 +78890,6 @@ index 7bdfd334c9eb..fb7482f075fd 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -86293,7 +78939,7 @@ index 7bdfd334c9eb..fb7482f075fd 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -86319,7 +78965,7 @@ index 7bdfd334c9eb..fb7482f075fd 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -86361,18 +79007,10 @@ index 7bdfd334c9eb..fb7482f075fd 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 bc4699b03b1f..e81adae3ae48 100644
+index c7bd4f21f6e3..ebd7d2e99290 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -86380,6 +79018,7 @@ index bc4699b03b1f..e81adae3ae48 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -86388,23 +79027,18 @@ index bc4699b03b1f..e81adae3ae48 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -86423,10 +79057,6 @@ index bc4699b03b1f..e81adae3ae48 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -86434,10 +79064,6 @@ index bc4699b03b1f..e81adae3ae48 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -86445,7 +79071,6 @@ index bc4699b03b1f..e81adae3ae48 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -86453,10 +79078,6 @@ index bc4699b03b1f..e81adae3ae48 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -86469,10 +79090,6 @@ index bc4699b03b1f..e81adae3ae48 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -86503,7 +79120,7 @@ index bc4699b03b1f..e81adae3ae48 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -86590,7 +79207,7 @@ index bc4699b03b1f..e81adae3ae48 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 110a2268825e..f5df159ef2c1 100644
+index a0c76957de3d..ccb70c641b40 100644
--- third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
+++ third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -86601,6 +79218,7 @@ index 110a2268825e..f5df159ef2c1 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -86609,13 +79227,12 @@ index 110a2268825e..f5df159ef2c1 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -86654,7 +79271,6 @@ index 110a2268825e..f5df159ef2c1 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -86704,7 +79320,7 @@ index 110a2268825e..f5df159ef2c1 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -86730,7 +79346,7 @@ index 110a2268825e..f5df159ef2c1 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -86772,7 +79388,7 @@ index 110a2268825e..f5df159ef2c1 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 fb086fe47844..3033d814afa7 100644
+index 9705d844e9e6..c603c3162a19 100644
--- third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
+++ third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -86783,6 +79399,7 @@ index fb086fe47844..3033d814afa7 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -86791,13 +79408,12 @@ index fb086fe47844..3033d814afa7 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -86836,7 +79452,6 @@ index fb086fe47844..3033d814afa7 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -86886,7 +79501,7 @@ index fb086fe47844..3033d814afa7 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -86912,7 +79527,7 @@ index fb086fe47844..3033d814afa7 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -86954,18 +79569,10 @@ index fb086fe47844..3033d814afa7 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 9f17e1be42ec..03f53c77a75a 100644
+index 7c795ea71573..f9d453b462bf 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -86973,6 +79580,7 @@ index 9f17e1be42ec..03f53c77a75a 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -86981,23 +79589,18 @@ index 9f17e1be42ec..03f53c77a75a 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -87016,10 +79619,6 @@ index 9f17e1be42ec..03f53c77a75a 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -87027,10 +79626,6 @@ index 9f17e1be42ec..03f53c77a75a 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -87038,7 +79633,6 @@ index 9f17e1be42ec..03f53c77a75a 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -87046,10 +79640,6 @@ index 9f17e1be42ec..03f53c77a75a 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -87062,10 +79652,6 @@ index 9f17e1be42ec..03f53c77a75a 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -87096,7 +79682,7 @@ index 9f17e1be42ec..03f53c77a75a 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -87183,18 +79769,10 @@ index 9f17e1be42ec..03f53c77a75a 100644
Library("copy_on_write_buffer_gn")
diff --git third_party/libwebrtc/rtc_base/cpu_info_gn/moz.build third_party/libwebrtc/rtc_base/cpu_info_gn/moz.build
-index 6a2345034a07..9dd328e92485 100644
+index 2b0cf4fb67b1..0e53770baf5f 100644
--- third_party/libwebrtc/rtc_base/cpu_info_gn/moz.build
+++ third_party/libwebrtc/rtc_base/cpu_info_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -87202,6 +79780,7 @@ index 6a2345034a07..9dd328e92485 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -87210,23 +79789,18 @@ index 6a2345034a07..9dd328e92485 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -87245,10 +79819,6 @@ index 6a2345034a07..9dd328e92485 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -87256,10 +79826,6 @@ index 6a2345034a07..9dd328e92485 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -87267,7 +79833,6 @@ index 6a2345034a07..9dd328e92485 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -87275,10 +79840,6 @@ index 6a2345034a07..9dd328e92485 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -87291,10 +79852,6 @@ index 6a2345034a07..9dd328e92485 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -87332,7 +79889,7 @@ index 6a2345034a07..9dd328e92485 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -87390,10 +79947,10 @@ index 6a2345034a07..9dd328e92485 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -87404,10 +79961,10 @@ index 6a2345034a07..9dd328e92485 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -87419,18 +79976,10 @@ index 6a2345034a07..9dd328e92485 100644
Library("cpu_info_gn")
diff --git third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
-index f11f29619d5e..de25562cd255 100644
+index c032b1a986a3..3a591ec6e96c 100644
--- third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
+++ third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -87438,6 +79987,7 @@ index f11f29619d5e..de25562cd255 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -87446,23 +79996,18 @@ index f11f29619d5e..de25562cd255 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -87481,10 +80026,6 @@ index f11f29619d5e..de25562cd255 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -87492,10 +80033,6 @@ index f11f29619d5e..de25562cd255 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -87503,7 +80040,6 @@ index f11f29619d5e..de25562cd255 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -87511,10 +80047,6 @@ index f11f29619d5e..de25562cd255 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -87527,10 +80059,6 @@ index f11f29619d5e..de25562cd255 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -87561,7 +80089,7 @@ index f11f29619d5e..de25562cd255 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -87648,18 +80176,10 @@ index f11f29619d5e..de25562cd255 100644
Library("criticalsection_gn")
diff --git third_party/libwebrtc/rtc_base/denormal_disabler_gn/moz.build third_party/libwebrtc/rtc_base/denormal_disabler_gn/moz.build
-index 32d3eabe7182..1716888a1540 100644
+index 266f0b403372..a7632439b491 100644
--- third_party/libwebrtc/rtc_base/denormal_disabler_gn/moz.build
+++ third_party/libwebrtc/rtc_base/denormal_disabler_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -87667,6 +80187,7 @@ index 32d3eabe7182..1716888a1540 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -87675,23 +80196,18 @@ index 32d3eabe7182..1716888a1540 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -87710,10 +80226,6 @@ index 32d3eabe7182..1716888a1540 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -87721,10 +80233,6 @@ index 32d3eabe7182..1716888a1540 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -87732,7 +80240,6 @@ index 32d3eabe7182..1716888a1540 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -87740,10 +80247,6 @@ index 32d3eabe7182..1716888a1540 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -87756,10 +80259,6 @@ index 32d3eabe7182..1716888a1540 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -87790,7 +80289,7 @@ index 32d3eabe7182..1716888a1540 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -87877,7 +80376,7 @@ index 32d3eabe7182..1716888a1540 100644
Library("denormal_disabler_gn")
diff --git third_party/libwebrtc/rtc_base/divide_round_gn/moz.build third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
-index c45abd0214c2..5afb72a8871d 100644
+index f947044a70c5..cef2ec4afcd9 100644
--- third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
+++ third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -87888,6 +80387,7 @@ index c45abd0214c2..5afb72a8871d 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -87896,13 +80396,12 @@ index c45abd0214c2..5afb72a8871d 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -87941,7 +80440,6 @@ index c45abd0214c2..5afb72a8871d 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -87991,7 +80489,7 @@ index c45abd0214c2..5afb72a8871d 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -88017,7 +80515,7 @@ index c45abd0214c2..5afb72a8871d 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -88059,7 +80557,7 @@ index c45abd0214c2..5afb72a8871d 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 67fc0c9f2946..db5bc6af820e 100644
+index a21e8af3a982..d16a56b3c8be 100644
--- third_party/libwebrtc/rtc_base/dscp_gn/moz.build
+++ third_party/libwebrtc/rtc_base/dscp_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -88070,6 +80568,7 @@ index 67fc0c9f2946..db5bc6af820e 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -88078,13 +80577,12 @@ index 67fc0c9f2946..db5bc6af820e 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -88119,7 +80617,6 @@ index 67fc0c9f2946..db5bc6af820e 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -88169,7 +80666,7 @@ index 67fc0c9f2946..db5bc6af820e 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -88195,7 +80692,7 @@ index 67fc0c9f2946..db5bc6af820e 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -88237,18 +80734,10 @@ index 67fc0c9f2946..db5bc6af820e 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 9871decbb1aa..e090fdcce24c 100644
+index d70f8d5bf102..0ed150dc70b7 100644
--- third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -88256,6 +80745,7 @@ index 9871decbb1aa..e090fdcce24c 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -88264,23 +80754,18 @@ index 9871decbb1aa..e090fdcce24c 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -88299,10 +80784,6 @@ index 9871decbb1aa..e090fdcce24c 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -88310,10 +80791,6 @@ index 9871decbb1aa..e090fdcce24c 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -88321,7 +80798,6 @@ index 9871decbb1aa..e090fdcce24c 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -88329,10 +80805,6 @@ index 9871decbb1aa..e090fdcce24c 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -88345,10 +80817,6 @@ index 9871decbb1aa..e090fdcce24c 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -88386,7 +80854,7 @@ index 9871decbb1aa..e090fdcce24c 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -88444,10 +80912,10 @@ index 9871decbb1aa..e090fdcce24c 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -88458,10 +80926,10 @@ index 9871decbb1aa..e090fdcce24c 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -88473,18 +80941,10 @@ index 9871decbb1aa..e090fdcce24c 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 6f3804964680..09ee866580b3 100644
+index d5ccba752185..1353fd9971e1 100644
--- third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -88492,6 +80952,7 @@ index 6f3804964680..09ee866580b3 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -88500,23 +80961,18 @@ index 6f3804964680..09ee866580b3 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -88535,10 +80991,6 @@ index 6f3804964680..09ee866580b3 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -88546,10 +80998,6 @@ index 6f3804964680..09ee866580b3 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -88557,7 +81005,6 @@ index 6f3804964680..09ee866580b3 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -88565,10 +81012,6 @@ index 6f3804964680..09ee866580b3 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -88581,10 +81024,6 @@ index 6f3804964680..09ee866580b3 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -88622,7 +81061,7 @@ index 6f3804964680..09ee866580b3 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -88680,10 +81119,10 @@ index 6f3804964680..09ee866580b3 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -88694,10 +81133,10 @@ index 6f3804964680..09ee866580b3 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -88709,18 +81148,10 @@ index 6f3804964680..09ee866580b3 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 bbf714b33195..15fcbde02d97 100644
+index cce401c6f0b3..55178aa20743 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -88728,6 +81159,7 @@ index bbf714b33195..15fcbde02d97 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -88736,23 +81168,18 @@ index bbf714b33195..15fcbde02d97 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -88771,10 +81198,6 @@ index bbf714b33195..15fcbde02d97 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -88782,10 +81205,6 @@ index bbf714b33195..15fcbde02d97 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -88793,7 +81212,6 @@ index bbf714b33195..15fcbde02d97 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -88801,10 +81219,6 @@ index bbf714b33195..15fcbde02d97 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -88817,10 +81231,6 @@ index bbf714b33195..15fcbde02d97 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -88858,7 +81268,7 @@ index bbf714b33195..15fcbde02d97 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -88916,10 +81326,10 @@ index bbf714b33195..15fcbde02d97 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -88930,10 +81340,10 @@ index bbf714b33195..15fcbde02d97 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -88945,18 +81355,10 @@ index bbf714b33195..15fcbde02d97 100644
Library("balanced_degradation_settings_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 439ec1d4e7c9..52a1550b84d0 100644
+index ebeb77db3013..bf97dcb17792 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -88964,6 +81366,7 @@ index 439ec1d4e7c9..52a1550b84d0 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -88972,23 +81375,18 @@ index 439ec1d4e7c9..52a1550b84d0 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -89007,10 +81405,6 @@ index 439ec1d4e7c9..52a1550b84d0 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -89018,10 +81412,6 @@ index 439ec1d4e7c9..52a1550b84d0 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -89029,7 +81419,6 @@ index 439ec1d4e7c9..52a1550b84d0 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -89037,10 +81426,6 @@ index 439ec1d4e7c9..52a1550b84d0 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -89053,10 +81438,6 @@ index 439ec1d4e7c9..52a1550b84d0 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -89094,7 +81475,7 @@ index 439ec1d4e7c9..52a1550b84d0 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -89152,10 +81533,10 @@ index 439ec1d4e7c9..52a1550b84d0 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -89166,10 +81547,10 @@ index 439ec1d4e7c9..52a1550b84d0 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -89181,18 +81562,10 @@ index 439ec1d4e7c9..52a1550b84d0 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 bf20d2672978..f694fc71932b 100644
+index c6806c13de0a..18300e83b968 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -89200,6 +81573,7 @@ index bf20d2672978..f694fc71932b 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -89208,23 +81582,18 @@ index bf20d2672978..f694fc71932b 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -49,114 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -89243,10 +81612,6 @@ index bf20d2672978..f694fc71932b 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -89254,10 +81619,6 @@ index bf20d2672978..f694fc71932b 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -89265,7 +81626,6 @@ index bf20d2672978..f694fc71932b 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -89273,10 +81633,6 @@ index bf20d2672978..f694fc71932b 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -89289,10 +81645,6 @@ index bf20d2672978..f694fc71932b 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -89330,7 +81682,7 @@ index bf20d2672978..f694fc71932b 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -164,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -89388,10 +81740,10 @@ index bf20d2672978..f694fc71932b 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -89402,10 +81754,10 @@ index bf20d2672978..f694fc71932b 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -89417,18 +81769,10 @@ index bf20d2672978..f694fc71932b 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 3ab54cf6bd88..e7cba2997a14 100644
+index 75a2fd41366c..ea85ffff3111 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -89436,6 +81780,7 @@ index 3ab54cf6bd88..e7cba2997a14 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -89444,23 +81789,18 @@ index 3ab54cf6bd88..e7cba2997a14 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -89479,10 +81819,6 @@ index 3ab54cf6bd88..e7cba2997a14 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -89490,10 +81826,6 @@ index 3ab54cf6bd88..e7cba2997a14 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -89501,7 +81833,6 @@ index 3ab54cf6bd88..e7cba2997a14 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -89509,10 +81840,6 @@ index 3ab54cf6bd88..e7cba2997a14 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -89525,10 +81852,6 @@ index 3ab54cf6bd88..e7cba2997a14 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -89566,7 +81889,7 @@ index 3ab54cf6bd88..e7cba2997a14 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -89624,10 +81947,10 @@ index 3ab54cf6bd88..e7cba2997a14 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -89638,10 +81961,10 @@ index 3ab54cf6bd88..e7cba2997a14 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -89653,18 +81976,10 @@ index 3ab54cf6bd88..e7cba2997a14 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 07f12b5051b7..6dcc86225977 100644
+index 07a834739abc..6526a4d69c90 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -89672,6 +81987,7 @@ index 07f12b5051b7..6dcc86225977 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -89680,23 +81996,18 @@ index 07f12b5051b7..6dcc86225977 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -89715,10 +82026,6 @@ index 07f12b5051b7..6dcc86225977 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -89726,10 +82033,6 @@ index 07f12b5051b7..6dcc86225977 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -89737,7 +82040,6 @@ index 07f12b5051b7..6dcc86225977 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -89745,10 +82047,6 @@ index 07f12b5051b7..6dcc86225977 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -89761,10 +82059,6 @@ index 07f12b5051b7..6dcc86225977 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -89802,7 +82096,7 @@ index 07f12b5051b7..6dcc86225977 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -89860,10 +82154,10 @@ index 07f12b5051b7..6dcc86225977 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -89874,10 +82168,10 @@ index 07f12b5051b7..6dcc86225977 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -89889,18 +82183,10 @@ index 07f12b5051b7..6dcc86225977 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 79de1ae073a5..c92ecb38451c 100644
+index c804a04edc64..6270ba546b1f 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -89908,6 +82194,7 @@ index 79de1ae073a5..c92ecb38451c 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -89916,23 +82203,18 @@ index 79de1ae073a5..c92ecb38451c 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -89951,10 +82233,6 @@ index 79de1ae073a5..c92ecb38451c 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -89962,10 +82240,6 @@ index 79de1ae073a5..c92ecb38451c 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -89973,7 +82247,6 @@ index 79de1ae073a5..c92ecb38451c 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -89981,10 +82254,6 @@ index 79de1ae073a5..c92ecb38451c 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -89997,10 +82266,6 @@ index 79de1ae073a5..c92ecb38451c 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -90038,7 +82303,7 @@ index 79de1ae073a5..c92ecb38451c 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -90096,10 +82361,10 @@ index 79de1ae073a5..c92ecb38451c 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -90110,10 +82375,10 @@ index 79de1ae073a5..c92ecb38451c 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -90125,18 +82390,10 @@ index 79de1ae073a5..c92ecb38451c 100644
Library("normalize_simulcast_size_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 de5ccaa7e596..8ea47b1f2a07 100644
+index 4b8ce6541aad..fca99f2e0a66 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -90144,6 +82401,7 @@ index de5ccaa7e596..8ea47b1f2a07 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -90152,23 +82410,18 @@ index de5ccaa7e596..8ea47b1f2a07 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -90187,10 +82440,6 @@ index de5ccaa7e596..8ea47b1f2a07 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -90198,10 +82447,6 @@ index de5ccaa7e596..8ea47b1f2a07 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -90209,7 +82454,6 @@ index de5ccaa7e596..8ea47b1f2a07 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -90217,10 +82461,6 @@ index de5ccaa7e596..8ea47b1f2a07 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -90233,10 +82473,6 @@ index de5ccaa7e596..8ea47b1f2a07 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -90274,7 +82510,7 @@ index de5ccaa7e596..8ea47b1f2a07 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -90332,10 +82568,10 @@ index de5ccaa7e596..8ea47b1f2a07 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -90346,10 +82582,10 @@ index de5ccaa7e596..8ea47b1f2a07 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -90361,18 +82597,10 @@ index de5ccaa7e596..8ea47b1f2a07 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 db3d8c8a188b..e3623185b4c1 100644
+index 0930ef0477bc..175e3ff531e2 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -90380,6 +82608,7 @@ index db3d8c8a188b..e3623185b4c1 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -90388,23 +82617,18 @@ index db3d8c8a188b..e3623185b4c1 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -90423,10 +82647,6 @@ index db3d8c8a188b..e3623185b4c1 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -90434,10 +82654,6 @@ index db3d8c8a188b..e3623185b4c1 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -90445,7 +82661,6 @@ index db3d8c8a188b..e3623185b4c1 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -90453,10 +82668,6 @@ index db3d8c8a188b..e3623185b4c1 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -90469,10 +82680,6 @@ index db3d8c8a188b..e3623185b4c1 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -90510,7 +82717,7 @@ index db3d8c8a188b..e3623185b4c1 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -90568,10 +82775,10 @@ index db3d8c8a188b..e3623185b4c1 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -90582,10 +82789,10 @@ index db3d8c8a188b..e3623185b4c1 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -90597,18 +82804,10 @@ index db3d8c8a188b..e3623185b4c1 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 7866b4a70a4f..6d8d954f0400 100644
+index be79eb29ffe7..092a2cb2d143 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -90616,6 +82815,7 @@ index 7866b4a70a4f..6d8d954f0400 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -90624,23 +82824,18 @@ index 7866b4a70a4f..6d8d954f0400 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -90659,10 +82854,6 @@ index 7866b4a70a4f..6d8d954f0400 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -90670,10 +82861,6 @@ index 7866b4a70a4f..6d8d954f0400 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -90681,7 +82868,6 @@ index 7866b4a70a4f..6d8d954f0400 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -90689,10 +82875,6 @@ index 7866b4a70a4f..6d8d954f0400 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -90705,10 +82887,6 @@ index 7866b4a70a4f..6d8d954f0400 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -90746,7 +82924,7 @@ index 7866b4a70a4f..6d8d954f0400 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -90804,10 +82982,10 @@ index 7866b4a70a4f..6d8d954f0400 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -90818,10 +82996,10 @@ index 7866b4a70a4f..6d8d954f0400 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -90833,18 +83011,10 @@ index 7866b4a70a4f..6d8d954f0400 100644
Library("rate_control_settings_gn")
diff --git third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build
-index c8c61429d38f..47b3096ae1da 100644
+index 6172f4d96dfa..ad4e108a796b 100644
--- third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build
+++ third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -90852,6 +83022,7 @@ index c8c61429d38f..47b3096ae1da 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -90860,23 +83031,18 @@ index c8c61429d38f..47b3096ae1da 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -90895,10 +83061,6 @@ index c8c61429d38f..47b3096ae1da 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -90906,10 +83068,6 @@ index c8c61429d38f..47b3096ae1da 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -90917,7 +83075,6 @@ index c8c61429d38f..47b3096ae1da 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -90925,10 +83082,6 @@ index c8c61429d38f..47b3096ae1da 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -90941,10 +83094,6 @@ index c8c61429d38f..47b3096ae1da 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -90982,7 +83131,7 @@ index c8c61429d38f..47b3096ae1da 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -91040,10 +83189,10 @@ index c8c61429d38f..47b3096ae1da 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -91054,10 +83203,10 @@ index c8c61429d38f..47b3096ae1da 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -91069,7 +83218,7 @@ index c8c61429d38f..47b3096ae1da 100644
Library("frequency_tracker_gn")
diff --git third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
-index 6e4858c05e1d..e01a08018962 100644
+index 82a66f9119cd..96a8ea39c266 100644
--- third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
+++ third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -91080,6 +83229,7 @@ index 6e4858c05e1d..e01a08018962 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -91088,13 +83238,12 @@ index 6e4858c05e1d..e01a08018962 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -91129,7 +83278,6 @@ index 6e4858c05e1d..e01a08018962 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -91179,7 +83327,7 @@ index 6e4858c05e1d..e01a08018962 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -91205,7 +83353,7 @@ index 6e4858c05e1d..e01a08018962 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -91247,18 +83395,10 @@ index 6e4858c05e1d..e01a08018962 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 4c82ebf4f1a4..9bb8130d8c7a 100644
+index 833688440249..f10a11715812 100644
--- third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
+++ third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -91266,6 +83406,7 @@ index 4c82ebf4f1a4..9bb8130d8c7a 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -91274,23 +83415,18 @@ index 4c82ebf4f1a4..9bb8130d8c7a 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -91309,10 +83445,6 @@ index 4c82ebf4f1a4..9bb8130d8c7a 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -91320,10 +83452,6 @@ index 4c82ebf4f1a4..9bb8130d8c7a 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -91331,7 +83459,6 @@ index 4c82ebf4f1a4..9bb8130d8c7a 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -91339,10 +83466,6 @@ index 4c82ebf4f1a4..9bb8130d8c7a 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -91355,10 +83478,6 @@ index 4c82ebf4f1a4..9bb8130d8c7a 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -91389,7 +83508,7 @@ index 4c82ebf4f1a4..9bb8130d8c7a 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -91477,10 +83596,10 @@ index 4c82ebf4f1a4..9bb8130d8c7a 100644
Library("histogram_percentile_counter_gn")
diff --git third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build
deleted file mode 100644
-index 471d8a145443..000000000000
+index 7b10ad2fedfe..000000000000
--- third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build
+++ /dev/null
-@@ -1,99 +0,0 @@
+@@ -1,95 +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/.
@@ -91492,10 +83611,6 @@ index 471d8a145443..000000000000
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
--CXXFLAGS += [
-- "-std=gnu++20"
--]
--
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["ANDROID"] = True
-DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
@@ -91506,6 +83621,7 @@ index 471d8a145443..000000000000
-DEFINES["WEBRTC_ANDROID"] = True
-DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
-DEFINES["WEBRTC_LINUX"] = True
-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
@@ -91513,7 +83629,6 @@ index 471d8a145443..000000000000
-DEFINES["WEBRTC_POSIX"] = True
-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
-DEFINES["_GNU_SOURCE"] = True
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
-DEFINES["__STDC_CONSTANT_MACROS"] = True
-DEFINES["__STDC_FORMAT_MACROS"] = True
@@ -91581,7 +83696,7 @@ index 471d8a145443..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 f18c322cef73..70cbdf4c62e1 100644
+index 6456e230bfa9..8d9f02cb22b4 100644
--- third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
+++ third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -91592,6 +83707,7 @@ index f18c322cef73..70cbdf4c62e1 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -91600,13 +83716,12 @@ index f18c322cef73..70cbdf4c62e1 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -91641,7 +83756,6 @@ index f18c322cef73..70cbdf4c62e1 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -91691,7 +83805,7 @@ index f18c322cef73..70cbdf4c62e1 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -91717,7 +83831,7 @@ index f18c322cef73..70cbdf4c62e1 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -91759,18 +83873,10 @@ index f18c322cef73..70cbdf4c62e1 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 c67703077af9..8ff1adb6036f 100644
+index 202fd27525b6..77529d538252 100644
--- third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
+++ third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -91778,6 +83884,7 @@ index c67703077af9..8ff1adb6036f 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -91786,23 +83893,18 @@ index c67703077af9..8ff1adb6036f 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -91822,10 +83924,6 @@ index c67703077af9..8ff1adb6036f 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -91833,10 +83931,6 @@ index c67703077af9..8ff1adb6036f 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -91844,7 +83938,6 @@ index c67703077af9..8ff1adb6036f 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -91852,10 +83945,6 @@ index c67703077af9..8ff1adb6036f 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -91868,10 +83957,6 @@ index c67703077af9..8ff1adb6036f 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -91908,7 +83993,7 @@ index c67703077af9..8ff1adb6036f 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -91966,10 +84051,10 @@ index c67703077af9..8ff1adb6036f 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -91980,10 +84065,10 @@ index c67703077af9..8ff1adb6036f 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -91995,18 +84080,10 @@ index c67703077af9..8ff1adb6036f 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 853c5bcada13..d16275ec7067 100644
+index 659c105eeb02..d4b59daa7d6f 100644
--- third_party/libwebrtc/rtc_base/logging_gn/moz.build
+++ third_party/libwebrtc/rtc_base/logging_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -92015,6 +84092,7 @@ index 853c5bcada13..d16275ec7067 100644
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -92023,23 +84101,18 @@ index 853c5bcada13..d16275ec7067 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,114 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -92058,10 +84131,6 @@ index 853c5bcada13..d16275ec7067 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -92069,10 +84138,6 @@ index 853c5bcada13..d16275ec7067 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -92080,7 +84145,6 @@ index 853c5bcada13..d16275ec7067 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -92088,10 +84152,6 @@ index 853c5bcada13..d16275ec7067 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -92104,10 +84164,6 @@ index 853c5bcada13..d16275ec7067 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -92145,7 +84201,7 @@ index 853c5bcada13..d16275ec7067 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -92203,10 +84259,10 @@ index 853c5bcada13..d16275ec7067 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -92217,10 +84273,10 @@ index 853c5bcada13..d16275ec7067 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -92232,7 +84288,7 @@ index 853c5bcada13..d16275ec7067 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 fc6e8f693b98..17687531d1c6 100644
+index c12cf66ea418..ca5ca6a0d967 100644
--- third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
+++ third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -92243,6 +84299,7 @@ index fc6e8f693b98..17687531d1c6 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -92251,13 +84308,12 @@ index fc6e8f693b98..17687531d1c6 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92292,7 +84348,6 @@ index fc6e8f693b98..17687531d1c6 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -92342,7 +84397,7 @@ index fc6e8f693b98..17687531d1c6 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -92368,7 +84423,7 @@ index fc6e8f693b98..17687531d1c6 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -92410,18 +84465,10 @@ index fc6e8f693b98..17687531d1c6 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 3c352afea7ec..6ad9b42d6dc4 100644
+index 764b220dcf8f..2a12495bcdf6 100644
--- third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
+++ third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -92429,6 +84476,7 @@ index 3c352afea7ec..6ad9b42d6dc4 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -92437,23 +84485,18 @@ index 3c352afea7ec..6ad9b42d6dc4 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -92472,10 +84515,6 @@ index 3c352afea7ec..6ad9b42d6dc4 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -92483,10 +84522,6 @@ index 3c352afea7ec..6ad9b42d6dc4 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -92494,7 +84529,6 @@ index 3c352afea7ec..6ad9b42d6dc4 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -92502,10 +84536,6 @@ index 3c352afea7ec..6ad9b42d6dc4 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -92518,10 +84548,6 @@ index 3c352afea7ec..6ad9b42d6dc4 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -92552,7 +84578,7 @@ index 3c352afea7ec..6ad9b42d6dc4 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -92639,7 +84665,7 @@ index 3c352afea7ec..6ad9b42d6dc4 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 7b6b50b9dd15..03d6e54acba9 100644
+index 0750ed9e64f9..e741274c96a3 100644
--- third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
+++ third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -92650,6 +84676,7 @@ index 7b6b50b9dd15..03d6e54acba9 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -92658,13 +84685,12 @@ index 7b6b50b9dd15..03d6e54acba9 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92703,7 +84729,6 @@ index 7b6b50b9dd15..03d6e54acba9 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -92753,7 +84778,7 @@ index 7b6b50b9dd15..03d6e54acba9 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -92779,7 +84804,7 @@ index 7b6b50b9dd15..03d6e54acba9 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -92821,7 +84846,7 @@ index 7b6b50b9dd15..03d6e54acba9 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 8bf71a1ab9b2..084355af82e2 100644
+index 5461d491dff4..3f8532394ef4 100644
--- third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
+++ third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -92832,6 +84857,7 @@ index 8bf71a1ab9b2..084355af82e2 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -92840,13 +84866,12 @@ index 8bf71a1ab9b2..084355af82e2 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92885,7 +84910,6 @@ index 8bf71a1ab9b2..084355af82e2 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -92935,7 +84959,7 @@ index 8bf71a1ab9b2..084355af82e2 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -92961,7 +84985,7 @@ index 8bf71a1ab9b2..084355af82e2 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -93003,18 +85027,10 @@ index 8bf71a1ab9b2..084355af82e2 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 250d021bf165..01e254bed37a 100644
+index 9ec122a9ce5f..27ce5039d3c6 100644
--- third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
+++ third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -93022,6 +85038,7 @@ index 250d021bf165..01e254bed37a 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -93030,23 +85047,18 @@ index 250d021bf165..01e254bed37a 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -93066,10 +85078,6 @@ index 250d021bf165..01e254bed37a 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -93077,10 +85085,6 @@ index 250d021bf165..01e254bed37a 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -93088,7 +85092,6 @@ index 250d021bf165..01e254bed37a 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -93096,10 +85099,6 @@ index 250d021bf165..01e254bed37a 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -93112,10 +85111,6 @@ index 250d021bf165..01e254bed37a 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -93152,7 +85147,7 @@ index 250d021bf165..01e254bed37a 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -93210,10 +85205,10 @@ index 250d021bf165..01e254bed37a 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -93224,10 +85219,10 @@ index 250d021bf165..01e254bed37a 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -93239,18 +85234,10 @@ index 250d021bf165..01e254bed37a 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 6b3882c8e215..28cf9963eb6f 100644
+index d3b3da72d146..c44bd3b53ae0 100644
--- third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
+++ third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -93258,6 +85245,7 @@ index 6b3882c8e215..28cf9963eb6f 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -93266,23 +85254,18 @@ index 6b3882c8e215..28cf9963eb6f 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,103 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -93297,10 +85280,6 @@ index 6b3882c8e215..28cf9963eb6f 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -93308,10 +85287,6 @@ index 6b3882c8e215..28cf9963eb6f 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -93319,7 +85294,6 @@ index 6b3882c8e215..28cf9963eb6f 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -93327,10 +85301,6 @@ index 6b3882c8e215..28cf9963eb6f 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -93343,10 +85313,6 @@ index 6b3882c8e215..28cf9963eb6f 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -93377,7 +85343,7 @@ index 6b3882c8e215..28cf9963eb6f 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -150,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -93435,10 +85401,10 @@ index 6b3882c8e215..28cf9963eb6f 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -93449,10 +85415,10 @@ index 6b3882c8e215..28cf9963eb6f 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -93464,18 +85430,10 @@ index 6b3882c8e215..28cf9963eb6f 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 64a02b49cd61..1fb29bdbddeb 100644
+index 31053e12ea4a..fe1e8a9ea932 100644
--- third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
+++ third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -93483,6 +85441,7 @@ index 64a02b49cd61..1fb29bdbddeb 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -93491,23 +85450,18 @@ index 64a02b49cd61..1fb29bdbddeb 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -93526,10 +85480,6 @@ index 64a02b49cd61..1fb29bdbddeb 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -93537,10 +85487,6 @@ index 64a02b49cd61..1fb29bdbddeb 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -93548,7 +85494,6 @@ index 64a02b49cd61..1fb29bdbddeb 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -93556,10 +85501,6 @@ index 64a02b49cd61..1fb29bdbddeb 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -93572,10 +85513,6 @@ index 64a02b49cd61..1fb29bdbddeb 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -93606,7 +85543,7 @@ index 64a02b49cd61..1fb29bdbddeb 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -93693,18 +85630,10 @@ index 64a02b49cd61..1fb29bdbddeb 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 90b5bcd80497..2a5e0afd12ea 100644
+index 06557cf9497d..db90cbe755bb 100644
--- third_party/libwebrtc/rtc_base/network_route_gn/moz.build
+++ third_party/libwebrtc/rtc_base/network_route_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -93712,6 +85641,7 @@ index 90b5bcd80497..2a5e0afd12ea 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -93720,23 +85650,18 @@ index 90b5bcd80497..2a5e0afd12ea 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -93755,10 +85680,6 @@ index 90b5bcd80497..2a5e0afd12ea 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -93766,10 +85687,6 @@ index 90b5bcd80497..2a5e0afd12ea 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -93777,7 +85694,6 @@ index 90b5bcd80497..2a5e0afd12ea 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -93785,10 +85701,6 @@ index 90b5bcd80497..2a5e0afd12ea 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -93801,10 +85713,6 @@ index 90b5bcd80497..2a5e0afd12ea 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -93835,7 +85743,7 @@ index 90b5bcd80497..2a5e0afd12ea 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -93922,18 +85830,10 @@ index 90b5bcd80497..2a5e0afd12ea 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 d36a784ba3f9..6da644bc60af 100644
+index beffd8445b78..693b43b106dc 100644
--- third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
+++ third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -93941,6 +85841,7 @@ index d36a784ba3f9..6da644bc60af 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -93949,23 +85850,18 @@ index d36a784ba3f9..6da644bc60af 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -93985,10 +85881,6 @@ index d36a784ba3f9..6da644bc60af 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -93996,10 +85888,6 @@ index d36a784ba3f9..6da644bc60af 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -94007,7 +85895,6 @@ index d36a784ba3f9..6da644bc60af 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -94015,10 +85902,6 @@ index d36a784ba3f9..6da644bc60af 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -94031,10 +85914,6 @@ index d36a784ba3f9..6da644bc60af 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -94072,7 +85951,7 @@ index d36a784ba3f9..6da644bc60af 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -94130,10 +86009,10 @@ index d36a784ba3f9..6da644bc60af 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -94144,10 +86023,10 @@ index d36a784ba3f9..6da644bc60af 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -94159,7 +86038,7 @@ index d36a784ba3f9..6da644bc60af 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 43975dc4d3dd..054a6b377ce4 100644
+index df5836570385..150831277c97 100644
--- third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
+++ third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -94170,6 +86049,7 @@ index 43975dc4d3dd..054a6b377ce4 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -94178,13 +86058,12 @@ index 43975dc4d3dd..054a6b377ce4 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -94223,7 +86102,6 @@ index 43975dc4d3dd..054a6b377ce4 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -94273,7 +86151,7 @@ index 43975dc4d3dd..054a6b377ce4 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -94299,7 +86177,7 @@ index 43975dc4d3dd..054a6b377ce4 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -94341,18 +86219,10 @@ index 43975dc4d3dd..054a6b377ce4 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 2f3cc276bd06..2b3a860c4426 100644
+index 9df9a5970796..96b61f54cadd 100644
--- third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
+++ third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -94360,6 +86230,7 @@ index 2f3cc276bd06..2b3a860c4426 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -94368,23 +86239,18 @@ index 2f3cc276bd06..2b3a860c4426 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -94403,10 +86269,6 @@ index 2f3cc276bd06..2b3a860c4426 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -94414,10 +86276,6 @@ index 2f3cc276bd06..2b3a860c4426 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -94425,7 +86283,6 @@ index 2f3cc276bd06..2b3a860c4426 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -94433,10 +86290,6 @@ index 2f3cc276bd06..2b3a860c4426 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -94449,10 +86302,6 @@ index 2f3cc276bd06..2b3a860c4426 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -94490,7 +86339,7 @@ index 2f3cc276bd06..2b3a860c4426 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -94548,10 +86397,10 @@ index 2f3cc276bd06..2b3a860c4426 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -94562,10 +86411,10 @@ index 2f3cc276bd06..2b3a860c4426 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -94577,18 +86426,10 @@ index 2f3cc276bd06..2b3a860c4426 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 835c1fbf08b6..b38ba39f3d4e 100644
+index 483fc3f4157a..de5e498e7276 100644
--- third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
+++ third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -94596,6 +86437,7 @@ index 835c1fbf08b6..b38ba39f3d4e 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -94604,23 +86446,18 @@ index 835c1fbf08b6..b38ba39f3d4e 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -94639,10 +86476,6 @@ index 835c1fbf08b6..b38ba39f3d4e 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -94650,10 +86483,6 @@ index 835c1fbf08b6..b38ba39f3d4e 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -94661,7 +86490,6 @@ index 835c1fbf08b6..b38ba39f3d4e 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -94669,10 +86497,6 @@ index 835c1fbf08b6..b38ba39f3d4e 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -94685,10 +86509,6 @@ index 835c1fbf08b6..b38ba39f3d4e 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -94719,7 +86539,7 @@ index 835c1fbf08b6..b38ba39f3d4e 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -94806,7 +86626,7 @@ index 835c1fbf08b6..b38ba39f3d4e 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 9067fc0643a5..293ec660b38f 100644
+index 978991e022cc..9b750326f9fd 100644
--- third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
+++ third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -94817,6 +86637,7 @@ index 9067fc0643a5..293ec660b38f 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -94825,13 +86646,12 @@ index 9067fc0643a5..293ec660b38f 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -94866,7 +86686,6 @@ index 9067fc0643a5..293ec660b38f 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -94916,7 +86735,7 @@ index 9067fc0643a5..293ec660b38f 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -94942,7 +86761,7 @@ index 9067fc0643a5..293ec660b38f 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -94984,18 +86803,10 @@ index 9067fc0643a5..293ec660b38f 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 e7748ce732f6..1500b41661b3 100644
+index 40f116cdf02f..fd5b113818a0 100644
--- third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
+++ third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -95003,6 +86814,7 @@ index e7748ce732f6..1500b41661b3 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -95011,23 +86823,18 @@ index e7748ce732f6..1500b41661b3 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -95046,10 +86853,6 @@ index e7748ce732f6..1500b41661b3 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -95057,10 +86860,6 @@ index e7748ce732f6..1500b41661b3 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -95068,7 +86867,6 @@ index e7748ce732f6..1500b41661b3 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -95076,10 +86874,6 @@ index e7748ce732f6..1500b41661b3 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -95092,10 +86886,6 @@ index e7748ce732f6..1500b41661b3 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -95126,7 +86916,7 @@ index e7748ce732f6..1500b41661b3 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -95213,18 +87003,10 @@ index e7748ce732f6..1500b41661b3 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 7c69b2b2baca..a7a696a78544 100644
+index 91128f649d33..994b0123cb5b 100644
--- third_party/libwebrtc/rtc_base/random_gn/moz.build
+++ third_party/libwebrtc/rtc_base/random_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -95232,6 +87014,7 @@ index 7c69b2b2baca..a7a696a78544 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -95240,23 +87023,18 @@ index 7c69b2b2baca..a7a696a78544 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -95275,10 +87053,6 @@ index 7c69b2b2baca..a7a696a78544 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -95286,10 +87060,6 @@ index 7c69b2b2baca..a7a696a78544 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -95297,7 +87067,6 @@ index 7c69b2b2baca..a7a696a78544 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -95305,10 +87074,6 @@ index 7c69b2b2baca..a7a696a78544 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -95321,10 +87086,6 @@ index 7c69b2b2baca..a7a696a78544 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -95355,7 +87116,7 @@ index 7c69b2b2baca..a7a696a78544 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -95442,18 +87203,10 @@ index 7c69b2b2baca..a7a696a78544 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 999ecfa5ee3a..da43fa0b57f5 100644
+index e41ea09b0ea2..4599539f7bbd 100644
--- third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -95461,6 +87214,7 @@ index 999ecfa5ee3a..da43fa0b57f5 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -95469,23 +87223,18 @@ index 999ecfa5ee3a..da43fa0b57f5 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -95504,10 +87253,6 @@ index 999ecfa5ee3a..da43fa0b57f5 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -95515,10 +87260,6 @@ index 999ecfa5ee3a..da43fa0b57f5 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -95526,7 +87267,6 @@ index 999ecfa5ee3a..da43fa0b57f5 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -95534,10 +87274,6 @@ index 999ecfa5ee3a..da43fa0b57f5 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -95550,10 +87286,6 @@ index 999ecfa5ee3a..da43fa0b57f5 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -95591,7 +87323,7 @@ index 999ecfa5ee3a..da43fa0b57f5 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -95649,10 +87381,10 @@ index 999ecfa5ee3a..da43fa0b57f5 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -95663,10 +87395,10 @@ index 999ecfa5ee3a..da43fa0b57f5 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -95678,18 +87410,10 @@ index 999ecfa5ee3a..da43fa0b57f5 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 42f252ca7732..18ff4d3a3f9e 100644
+index 71d485c13568..a544f01597c0 100644
--- third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -95697,6 +87421,7 @@ index 42f252ca7732..18ff4d3a3f9e 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -95705,23 +87430,18 @@ index 42f252ca7732..18ff4d3a3f9e 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -95740,10 +87460,6 @@ index 42f252ca7732..18ff4d3a3f9e 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -95751,10 +87467,6 @@ index 42f252ca7732..18ff4d3a3f9e 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -95762,7 +87474,6 @@ index 42f252ca7732..18ff4d3a3f9e 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -95770,10 +87481,6 @@ index 42f252ca7732..18ff4d3a3f9e 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -95786,10 +87493,6 @@ index 42f252ca7732..18ff4d3a3f9e 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -95827,7 +87530,7 @@ index 42f252ca7732..18ff4d3a3f9e 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -95885,10 +87588,10 @@ index 42f252ca7732..18ff4d3a3f9e 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -95899,10 +87602,10 @@ index 42f252ca7732..18ff4d3a3f9e 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -95914,18 +87617,10 @@ index 42f252ca7732..18ff4d3a3f9e 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 4634400c423d..5b89c75b3058 100644
+index 75698c8db945..c4fea54c2bff 100644
--- third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -95933,6 +87628,7 @@ index 4634400c423d..5b89c75b3058 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -95941,23 +87637,18 @@ index 4634400c423d..5b89c75b3058 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -95976,10 +87667,6 @@ index 4634400c423d..5b89c75b3058 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -95987,10 +87674,6 @@ index 4634400c423d..5b89c75b3058 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -95998,7 +87681,6 @@ index 4634400c423d..5b89c75b3058 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -96006,10 +87688,6 @@ index 4634400c423d..5b89c75b3058 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -96022,10 +87700,6 @@ index 4634400c423d..5b89c75b3058 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -96063,7 +87737,7 @@ index 4634400c423d..5b89c75b3058 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -96121,10 +87795,10 @@ index 4634400c423d..5b89c75b3058 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -96135,10 +87809,10 @@ index 4634400c423d..5b89c75b3058 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -96150,7 +87824,7 @@ index 4634400c423d..5b89c75b3058 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 2ec4b4c993a9..08ec8bc2590a 100644
+index 310f48f6fe48..7967acbb2978 100644
--- third_party/libwebrtc/rtc_base/refcount_gn/moz.build
+++ third_party/libwebrtc/rtc_base/refcount_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -96161,6 +87835,7 @@ index 2ec4b4c993a9..08ec8bc2590a 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -96169,13 +87844,12 @@ index 2ec4b4c993a9..08ec8bc2590a 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -96210,7 +87884,6 @@ index 2ec4b4c993a9..08ec8bc2590a 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -96260,7 +87933,7 @@ index 2ec4b4c993a9..08ec8bc2590a 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -96286,7 +87959,7 @@ index 2ec4b4c993a9..08ec8bc2590a 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -96328,7 +88001,7 @@ index 2ec4b4c993a9..08ec8bc2590a 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 71eaf72b7101..c3f335cd189d 100644
+index 8e1ad3270d6a..c1de16b7663d 100644
--- third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -96339,6 +88012,7 @@ index 71eaf72b7101..c3f335cd189d 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -96347,13 +88021,12 @@ index 71eaf72b7101..c3f335cd189d 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -96392,7 +88065,6 @@ index 71eaf72b7101..c3f335cd189d 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -96442,7 +88114,7 @@ index 71eaf72b7101..c3f335cd189d 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -96468,7 +88140,7 @@ index 71eaf72b7101..c3f335cd189d 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -96510,18 +88182,10 @@ index 71eaf72b7101..c3f335cd189d 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 12fadc1f9a42..e514f45c4c65 100644
+index 5a2ddf7b5535..52f42d277da4 100644
--- third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -96529,6 +88193,7 @@ index 12fadc1f9a42..e514f45c4c65 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -96537,23 +88202,18 @@ index 12fadc1f9a42..e514f45c4c65 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -96572,10 +88232,6 @@ index 12fadc1f9a42..e514f45c4c65 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -96583,10 +88239,6 @@ index 12fadc1f9a42..e514f45c4c65 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -96594,7 +88246,6 @@ index 12fadc1f9a42..e514f45c4c65 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -96602,10 +88253,6 @@ index 12fadc1f9a42..e514f45c4c65 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -96618,10 +88265,6 @@ index 12fadc1f9a42..e514f45c4c65 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -96652,7 +88295,7 @@ index 12fadc1f9a42..e514f45c4c65 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -96739,18 +88382,10 @@ index 12fadc1f9a42..e514f45c4c65 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 c720119a5c89..15f92340b6dc 100644
+index 31383355abe5..41f7c59fb1c4 100644
--- third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -96758,6 +88393,7 @@ index c720119a5c89..15f92340b6dc 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -96766,23 +88402,18 @@ index c720119a5c89..15f92340b6dc 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -48,107 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,86 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -96801,10 +88432,6 @@ index c720119a5c89..15f92340b6dc 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -96812,10 +88439,6 @@ index c720119a5c89..15f92340b6dc 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -96823,7 +88446,6 @@ index c720119a5c89..15f92340b6dc 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -96831,10 +88453,6 @@ index c720119a5c89..15f92340b6dc 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -96847,10 +88465,6 @@ index c720119a5c89..15f92340b6dc 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -96881,7 +88495,7 @@ index c720119a5c89..15f92340b6dc 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -156,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -135,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -96968,18 +88582,10 @@ index c720119a5c89..15f92340b6dc 100644
Library("rtc_numerics_gn")
diff --git third_party/libwebrtc/rtc_base/rtp_to_ntp_estimator_gn/moz.build third_party/libwebrtc/rtc_base/rtp_to_ntp_estimator_gn/moz.build
-index e0671e93a97e..4a51313a1e7c 100644
+index 6f2a3c9ce63d..ee9aa8bf7c35 100644
--- third_party/libwebrtc/rtc_base/rtp_to_ntp_estimator_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rtp_to_ntp_estimator_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -96987,6 +88593,7 @@ index e0671e93a97e..4a51313a1e7c 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -96995,23 +88602,18 @@ index e0671e93a97e..4a51313a1e7c 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -97030,10 +88632,6 @@ index e0671e93a97e..4a51313a1e7c 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -97041,10 +88639,6 @@ index e0671e93a97e..4a51313a1e7c 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -97052,7 +88646,6 @@ index e0671e93a97e..4a51313a1e7c 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -97060,10 +88653,6 @@ index e0671e93a97e..4a51313a1e7c 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -97076,10 +88665,6 @@ index e0671e93a97e..4a51313a1e7c 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -97117,7 +88702,7 @@ index e0671e93a97e..4a51313a1e7c 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -97175,10 +88760,10 @@ index e0671e93a97e..4a51313a1e7c 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -97189,10 +88774,10 @@ index e0671e93a97e..4a51313a1e7c 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -97204,7 +88789,7 @@ index e0671e93a97e..4a51313a1e7c 100644
Library("rtp_to_ntp_estimator_gn")
diff --git third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
-index 8412e5d46abd..3d944f71708e 100644
+index 1fccec1b3d1d..7a289dcd81cb 100644
--- third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
+++ third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -97215,6 +88800,7 @@ index 8412e5d46abd..3d944f71708e 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -97223,13 +88809,12 @@ index 8412e5d46abd..3d944f71708e 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -97264,7 +88849,6 @@ index 8412e5d46abd..3d944f71708e 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -97314,7 +88898,7 @@ index 8412e5d46abd..3d944f71708e 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -97340,7 +88924,7 @@ index 8412e5d46abd..3d944f71708e 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -97382,7 +88966,7 @@ index 8412e5d46abd..3d944f71708e 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 b9b5685168cd..6e907c03078e 100644
+index 4b1fe52dbb29..37d087dca314 100644
--- third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
+++ third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -97393,6 +88977,7 @@ index b9b5685168cd..6e907c03078e 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -97401,13 +88986,12 @@ index b9b5685168cd..6e907c03078e 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -97446,7 +89030,6 @@ index b9b5685168cd..6e907c03078e 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -97496,7 +89079,7 @@ index b9b5685168cd..6e907c03078e 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -97522,7 +89105,7 @@ index b9b5685168cd..6e907c03078e 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -97564,7 +89147,7 @@ index b9b5685168cd..6e907c03078e 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 9e7f9b007a04..4387f10d4765 100644
+index 19c9d560e6b0..b02b90eb7f8a 100644
--- third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
+++ third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -97575,6 +89158,7 @@ index 9e7f9b007a04..4387f10d4765 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -97583,13 +89167,12 @@ index 9e7f9b007a04..4387f10d4765 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -97628,7 +89211,6 @@ index 9e7f9b007a04..4387f10d4765 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -97678,7 +89260,7 @@ index 9e7f9b007a04..4387f10d4765 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -97704,7 +89286,7 @@ index 9e7f9b007a04..4387f10d4765 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -97746,18 +89328,10 @@ index 9e7f9b007a04..4387f10d4765 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 6ebef4d853b2..7f44a48ec748 100644
+index 2d6ffc700392..5657837196da 100644
--- third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
+++ third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -97765,6 +89339,7 @@ index 6ebef4d853b2..7f44a48ec748 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -97773,23 +89348,18 @@ index 6ebef4d853b2..7f44a48ec748 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -97808,10 +89378,6 @@ index 6ebef4d853b2..7f44a48ec748 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -97819,10 +89385,6 @@ index 6ebef4d853b2..7f44a48ec748 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -97830,7 +89392,6 @@ index 6ebef4d853b2..7f44a48ec748 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -97838,10 +89399,6 @@ index 6ebef4d853b2..7f44a48ec748 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -97854,10 +89411,6 @@ index 6ebef4d853b2..7f44a48ec748 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -97888,7 +89441,7 @@ index 6ebef4d853b2..7f44a48ec748 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -97975,7 +89528,7 @@ index 6ebef4d853b2..7f44a48ec748 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 ff05e2ced54e..635fdb7ef8cb 100644
+index 89ba6be7893d..65fc7a6bdcca 100644
--- third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -97986,6 +89539,7 @@ index ff05e2ced54e..635fdb7ef8cb 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -97994,13 +89548,12 @@ index ff05e2ced54e..635fdb7ef8cb 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -98035,7 +89588,6 @@ index ff05e2ced54e..635fdb7ef8cb 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -98085,7 +89637,7 @@ index ff05e2ced54e..635fdb7ef8cb 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -98111,7 +89663,7 @@ index ff05e2ced54e..635fdb7ef8cb 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -98153,18 +89705,10 @@ index ff05e2ced54e..635fdb7ef8cb 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 4e7011e90027..b217d69de204 100644
+index 41f48aed0ade..0a3d78361f9c 100644
--- third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
+++ third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -98172,6 +89716,7 @@ index 4e7011e90027..b217d69de204 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -98180,23 +89725,18 @@ index 4e7011e90027..b217d69de204 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -98216,10 +89756,6 @@ index 4e7011e90027..b217d69de204 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -98227,10 +89763,6 @@ index 4e7011e90027..b217d69de204 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -98238,7 +89770,6 @@ index 4e7011e90027..b217d69de204 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -98246,10 +89777,6 @@ index 4e7011e90027..b217d69de204 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -98262,10 +89789,6 @@ index 4e7011e90027..b217d69de204 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -98303,7 +89826,7 @@ index 4e7011e90027..b217d69de204 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -98361,10 +89884,10 @@ index 4e7011e90027..b217d69de204 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -98375,10 +89898,10 @@ index 4e7011e90027..b217d69de204 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -98390,7 +89913,7 @@ index 4e7011e90027..b217d69de204 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 d5451f5fa8df..18a7964355d5 100644
+index 7bb549d27ba9..4a07e285ccb1 100644
--- third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
+++ third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -98401,6 +89924,7 @@ index d5451f5fa8df..18a7964355d5 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -98409,13 +89933,12 @@ index d5451f5fa8df..18a7964355d5 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,95 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -98455,7 +89978,6 @@ index d5451f5fa8df..18a7964355d5 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -98512,7 +90034,7 @@ index d5451f5fa8df..18a7964355d5 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -98538,7 +90060,7 @@ index d5451f5fa8df..18a7964355d5 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -166,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -98580,18 +90102,10 @@ index d5451f5fa8df..18a7964355d5 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 389d1784c6a7..1b424e8ed744 100644
+index d2ec55c32168..cccc8cb30d11 100644
--- third_party/libwebrtc/rtc_base/socket_gn/moz.build
+++ third_party/libwebrtc/rtc_base/socket_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -98599,6 +90113,7 @@ index 389d1784c6a7..1b424e8ed744 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -98607,23 +90122,18 @@ index 389d1784c6a7..1b424e8ed744 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -98643,10 +90153,6 @@ index 389d1784c6a7..1b424e8ed744 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -98654,10 +90160,6 @@ index 389d1784c6a7..1b424e8ed744 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -98665,7 +90167,6 @@ index 389d1784c6a7..1b424e8ed744 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -98673,10 +90174,6 @@ index 389d1784c6a7..1b424e8ed744 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -98689,10 +90186,6 @@ index 389d1784c6a7..1b424e8ed744 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -98730,7 +90223,7 @@ index 389d1784c6a7..1b424e8ed744 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -98788,10 +90281,10 @@ index 389d1784c6a7..1b424e8ed744 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -98802,10 +90295,10 @@ index 389d1784c6a7..1b424e8ed744 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -98817,7 +90310,7 @@ index 389d1784c6a7..1b424e8ed744 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 4ca8dd7726b9..44180730ad13 100644
+index ac5a10fa4495..4d79666d6d70 100644
--- third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
+++ third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -98828,6 +90321,7 @@ index 4ca8dd7726b9..44180730ad13 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -98836,13 +90330,12 @@ index 4ca8dd7726b9..44180730ad13 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,95 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -98882,7 +90375,6 @@ index 4ca8dd7726b9..44180730ad13 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -98939,7 +90431,7 @@ index 4ca8dd7726b9..44180730ad13 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -98965,7 +90457,7 @@ index 4ca8dd7726b9..44180730ad13 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -166,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -99007,7 +90499,7 @@ index 4ca8dd7726b9..44180730ad13 100644
-
Library("socket_server_gn")
diff --git third_party/libwebrtc/rtc_base/ssl_adapter_gn/moz.build third_party/libwebrtc/rtc_base/ssl_adapter_gn/moz.build
-index 15aad07e729f..21e14c44e232 100644
+index d8170674c353..c2cf27cc74ea 100644
--- third_party/libwebrtc/rtc_base/ssl_adapter_gn/moz.build
+++ third_party/libwebrtc/rtc_base/ssl_adapter_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -99018,6 +90510,7 @@ index 15aad07e729f..21e14c44e232 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -99026,13 +90519,12 @@ index 15aad07e729f..21e14c44e232 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -99067,7 +90559,6 @@ index 15aad07e729f..21e14c44e232 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -99117,7 +90608,7 @@ index 15aad07e729f..21e14c44e232 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -99143,7 +90634,7 @@ index 15aad07e729f..21e14c44e232 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -99185,18 +90676,10 @@ index 15aad07e729f..21e14c44e232 100644
-
Library("ssl_adapter_gn")
diff --git third_party/libwebrtc/rtc_base/stringutils_gn/moz.build third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
-index 9894df29155b..2a11ffc34329 100644
+index 138bd260049f..204742c0f9e7 100644
--- third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
+++ third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -99204,6 +90687,7 @@ index 9894df29155b..2a11ffc34329 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -99212,23 +90696,18 @@ index 9894df29155b..2a11ffc34329 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -50,107 +63,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,86 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -99247,10 +90726,6 @@ index 9894df29155b..2a11ffc34329 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -99258,10 +90733,6 @@ index 9894df29155b..2a11ffc34329 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -99269,7 +90740,6 @@ index 9894df29155b..2a11ffc34329 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -99277,10 +90747,6 @@ index 9894df29155b..2a11ffc34329 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -99293,10 +90759,6 @@ index 9894df29155b..2a11ffc34329 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -99327,7 +90789,7 @@ index 9894df29155b..2a11ffc34329 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -158,82 +71,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -99414,7 +90876,7 @@ index 9894df29155b..2a11ffc34329 100644
Library("stringutils_gn")
diff --git third_party/libwebrtc/rtc_base/strong_alias_gn/moz.build third_party/libwebrtc/rtc_base/strong_alias_gn/moz.build
-index a3f31a7a6fdf..8c09540fd98d 100644
+index 6eaec231f687..274bcc3ee6a5 100644
--- third_party/libwebrtc/rtc_base/strong_alias_gn/moz.build
+++ third_party/libwebrtc/rtc_base/strong_alias_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -99425,6 +90887,7 @@ index a3f31a7a6fdf..8c09540fd98d 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -99433,13 +90896,12 @@ index a3f31a7a6fdf..8c09540fd98d 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -99474,7 +90936,6 @@ index a3f31a7a6fdf..8c09540fd98d 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -99524,7 +90985,7 @@ index a3f31a7a6fdf..8c09540fd98d 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -99550,7 +91011,7 @@ index a3f31a7a6fdf..8c09540fd98d 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -99592,7 +91053,7 @@ index a3f31a7a6fdf..8c09540fd98d 100644
-
Library("strong_alias_gn")
diff --git third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
-index 725c011556d5..0870b6d3f753 100644
+index 45f5b0fe25db..94b1bec9ec91 100644
--- third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
+++ third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -99603,6 +91064,7 @@ index 725c011556d5..0870b6d3f753 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -99611,13 +91073,12 @@ index 725c011556d5..0870b6d3f753 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -99656,7 +91117,6 @@ index 725c011556d5..0870b6d3f753 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -99706,7 +91166,7 @@ index 725c011556d5..0870b6d3f753 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -99732,7 +91192,7 @@ index 725c011556d5..0870b6d3f753 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -99774,7 +91234,7 @@ index 725c011556d5..0870b6d3f753 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 d37b0d0d971d..d83739dcb266 100644
+index ddf62c785a8b..38c55315511d 100644
--- third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
+++ third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -99785,6 +91245,7 @@ index d37b0d0d971d..d83739dcb266 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -99793,13 +91254,12 @@ index d37b0d0d971d..d83739dcb266 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -99838,7 +91298,6 @@ index d37b0d0d971d..d83739dcb266 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -99888,7 +91347,7 @@ index d37b0d0d971d..d83739dcb266 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -99914,7 +91373,7 @@ index d37b0d0d971d..d83739dcb266 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -99956,18 +91415,10 @@ index d37b0d0d971d..d83739dcb266 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 54de498e463f..abb84d91436b 100644
+index 49fefc605d17..837261699c1f 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -99975,6 +91426,7 @@ index 54de498e463f..abb84d91436b 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -99983,23 +91435,18 @@ index 54de498e463f..abb84d91436b 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -100018,10 +91465,6 @@ index 54de498e463f..abb84d91436b 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -100029,10 +91472,6 @@ index 54de498e463f..abb84d91436b 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -100040,7 +91479,6 @@ index 54de498e463f..abb84d91436b 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -100048,10 +91486,6 @@ index 54de498e463f..abb84d91436b 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -100064,10 +91498,6 @@ index 54de498e463f..abb84d91436b 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -100098,7 +91528,7 @@ index 54de498e463f..abb84d91436b 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -100185,18 +91615,10 @@ index 54de498e463f..abb84d91436b 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 5131b384449d..5ef7f00d6d94 100644
+index a23ba76960b9..7bc90e8a38bc 100644
--- third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
+++ third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -100204,6 +91626,7 @@ index 5131b384449d..5ef7f00d6d94 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -100212,23 +91635,18 @@ index 5131b384449d..5ef7f00d6d94 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,103 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -100243,10 +91661,6 @@ index 5131b384449d..5ef7f00d6d94 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -100254,10 +91668,6 @@ index 5131b384449d..5ef7f00d6d94 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -100265,7 +91675,6 @@ index 5131b384449d..5ef7f00d6d94 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -100273,10 +91682,6 @@ index 5131b384449d..5ef7f00d6d94 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -100289,10 +91694,6 @@ index 5131b384449d..5ef7f00d6d94 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -100323,7 +91724,7 @@ index 5131b384449d..5ef7f00d6d94 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -150,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -100381,10 +91782,10 @@ index 5131b384449d..5ef7f00d6d94 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -100395,10 +91796,10 @@ index 5131b384449d..5ef7f00d6d94 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -100410,18 +91811,10 @@ index 5131b384449d..5ef7f00d6d94 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 5fb11b5a4bb7..029670a84ab9 100644
+index bbfc46863f7e..7a3a8c9d8392 100644
--- third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
+++ third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -100429,6 +91822,7 @@ index 5fb11b5a4bb7..029670a84ab9 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -100437,23 +91831,18 @@ index 5fb11b5a4bb7..029670a84ab9 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -100472,10 +91861,6 @@ index 5fb11b5a4bb7..029670a84ab9 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -100483,10 +91868,6 @@ index 5fb11b5a4bb7..029670a84ab9 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -100494,7 +91875,6 @@ index 5fb11b5a4bb7..029670a84ab9 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -100502,10 +91882,6 @@ index 5fb11b5a4bb7..029670a84ab9 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -100518,10 +91894,6 @@ index 5fb11b5a4bb7..029670a84ab9 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -100552,7 +91924,7 @@ index 5fb11b5a4bb7..029670a84ab9 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -100639,7 +92011,7 @@ index 5fb11b5a4bb7..029670a84ab9 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 ba6494df25bc..eb72cb65f99a 100644
+index 545f0a4b0e51..aaccd7613890 100644
--- third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -100650,6 +92022,7 @@ index ba6494df25bc..eb72cb65f99a 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -100658,13 +92031,12 @@ index ba6494df25bc..eb72cb65f99a 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -100699,7 +92071,6 @@ index ba6494df25bc..eb72cb65f99a 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -100749,7 +92120,7 @@ index ba6494df25bc..eb72cb65f99a 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -100775,7 +92146,7 @@ index ba6494df25bc..eb72cb65f99a 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -100818,10 +92189,10 @@ index ba6494df25bc..eb72cb65f99a 100644
Library("arch_gn")
diff --git third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build
deleted file mode 100644
-index 089c08ecf102..000000000000
+index 6941a44d7273..000000000000
--- third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build
+++ /dev/null
-@@ -1,75 +0,0 @@
+@@ -1,74 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -100840,6 +92211,7 @@ index 089c08ecf102..000000000000
-DEFINES["WEBRTC_ARCH_ARM"] = True
-DEFINES["WEBRTC_ARCH_ARM_V7"] = True
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
-DEFINES["WEBRTC_HAS_NEON"] = True
-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
-DEFINES["WEBRTC_LINUX"] = True
@@ -100848,7 +92220,6 @@ index 089c08ecf102..000000000000
-DEFINES["WEBRTC_POSIX"] = True
-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
-DEFINES["_GNU_SOURCE"] = True
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-DEFINES["__STDC_CONSTANT_MACROS"] = True
-DEFINES["__STDC_FORMAT_MACROS"] = True
-
@@ -100892,14 +92263,13 @@ index 089c08ecf102..000000000000
- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_UDEV"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
-
-Library("asm_defines_gn")
diff --git third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build
deleted file mode 100644
-index 1da48987d8c3..000000000000
+index eb25c5bb304e..000000000000
--- third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build
+++ /dev/null
@@ -1,69 +0,0 @@
@@ -100923,13 +92293,13 @@ index 1da48987d8c3..000000000000
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
-DEFINES["WEBRTC_MAC"] = True
-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
-DEFINES["WEBRTC_POSIX"] = True
-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-DEFINES["__STDC_CONSTANT_MACROS"] = True
-DEFINES["__STDC_FORMAT_MACROS"] = True
-
@@ -100973,18 +92343,10 @@ index 1da48987d8c3..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 2e4e1d69d436..44faa970f9fa 100644
+index 63fa2b96e6b0..10e16e536ab8 100644
--- third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -100992,6 +92354,7 @@ index 2e4e1d69d436..44faa970f9fa 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -101000,23 +92363,18 @@ index 2e4e1d69d436..44faa970f9fa 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -101035,10 +92393,6 @@ index 2e4e1d69d436..44faa970f9fa 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -101046,10 +92400,6 @@ index 2e4e1d69d436..44faa970f9fa 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -101057,7 +92407,6 @@ index 2e4e1d69d436..44faa970f9fa 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -101065,10 +92414,6 @@ index 2e4e1d69d436..44faa970f9fa 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -101081,10 +92426,6 @@ index 2e4e1d69d436..44faa970f9fa 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -101115,7 +92456,7 @@ index 2e4e1d69d436..44faa970f9fa 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -101203,7 +92544,7 @@ index 2e4e1d69d436..44faa970f9fa 100644
Library("file_wrapper_gn")
diff --git third_party/libwebrtc/rtc_base/system/gcd_helpers_gn/moz.build third_party/libwebrtc/rtc_base/system/gcd_helpers_gn/moz.build
deleted file mode 100644
-index 6f7acfe97c19..000000000000
+index 96aeffe5015f..000000000000
--- third_party/libwebrtc/rtc_base/system/gcd_helpers_gn/moz.build
+++ /dev/null
@@ -1,69 +0,0 @@
@@ -101227,13 +92568,13 @@ index 6f7acfe97c19..000000000000
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
-DEFINES["WEBRTC_MAC"] = True
-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
-DEFINES["WEBRTC_POSIX"] = True
-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-DEFINES["__STDC_CONSTANT_MACROS"] = True
-DEFINES["__STDC_FORMAT_MACROS"] = True
-
@@ -101277,7 +92618,7 @@ index 6f7acfe97c19..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 a631f13a179d..0d1fb75179ef 100644
+index 09e048b3a0a9..9de0ab6e74a2 100644
--- third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -101288,6 +92629,7 @@ index a631f13a179d..0d1fb75179ef 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -101296,13 +92638,12 @@ index a631f13a179d..0d1fb75179ef 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -101337,7 +92678,6 @@ index a631f13a179d..0d1fb75179ef 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -101387,7 +92727,7 @@ index a631f13a179d..0d1fb75179ef 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -101413,7 +92753,7 @@ index a631f13a179d..0d1fb75179ef 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -101455,7 +92795,7 @@ index a631f13a179d..0d1fb75179ef 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 fed5d2d9dd25..e918460b84fe 100644
+index 8d7e24fe9ae8..353d3dbece53 100644
--- third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -101466,6 +92806,7 @@ index fed5d2d9dd25..e918460b84fe 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -101474,13 +92815,12 @@ index fed5d2d9dd25..e918460b84fe 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -101515,7 +92855,6 @@ index fed5d2d9dd25..e918460b84fe 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -101565,7 +92904,7 @@ index fed5d2d9dd25..e918460b84fe 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -101591,7 +92930,7 @@ index fed5d2d9dd25..e918460b84fe 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -101633,7 +92972,7 @@ index fed5d2d9dd25..e918460b84fe 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 ac54e7b6810d..176b44667775 100644
+index 47f76b807d12..7632cd32cd36 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -101644,6 +92983,7 @@ index ac54e7b6810d..176b44667775 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -101652,13 +92992,12 @@ index ac54e7b6810d..176b44667775 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -101693,7 +93032,6 @@ index ac54e7b6810d..176b44667775 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -101743,7 +93081,7 @@ index ac54e7b6810d..176b44667775 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -101769,7 +93107,7 @@ index ac54e7b6810d..176b44667775 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -101811,7 +93149,7 @@ index ac54e7b6810d..176b44667775 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 28109964edf2..be0f987a9fa0 100644
+index b5447466b541..80be20f613c2 100644
--- third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -101822,6 +93160,7 @@ index 28109964edf2..be0f987a9fa0 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -101830,13 +93169,12 @@ index 28109964edf2..be0f987a9fa0 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -101871,7 +93209,6 @@ index 28109964edf2..be0f987a9fa0 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -101921,7 +93258,7 @@ index 28109964edf2..be0f987a9fa0 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -101947,7 +93284,7 @@ index 28109964edf2..be0f987a9fa0 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -101989,7 +93326,7 @@ index 28109964edf2..be0f987a9fa0 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 fc470fbc0fb4..5deb07a2a80a 100644
+index 5348c6d421f6..aa077e5ab912 100644
--- third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -102000,6 +93337,7 @@ index fc470fbc0fb4..5deb07a2a80a 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -102008,13 +93346,12 @@ index fc470fbc0fb4..5deb07a2a80a 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -102049,7 +93386,6 @@ index fc470fbc0fb4..5deb07a2a80a 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -102099,7 +93435,7 @@ index fc470fbc0fb4..5deb07a2a80a 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -102125,7 +93461,7 @@ index fc470fbc0fb4..5deb07a2a80a 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -102167,7 +93503,7 @@ index fc470fbc0fb4..5deb07a2a80a 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 2d2eeaea1294..0acf53f14d5e 100644
+index d2bdd0c2e561..851d3877f698 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
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -102178,6 +93514,7 @@ index 2d2eeaea1294..0acf53f14d5e 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -102186,13 +93523,12 @@ index 2d2eeaea1294..0acf53f14d5e 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -102227,7 +93563,6 @@ index 2d2eeaea1294..0acf53f14d5e 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -102277,7 +93612,7 @@ index 2d2eeaea1294..0acf53f14d5e 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -102303,7 +93638,7 @@ index 2d2eeaea1294..0acf53f14d5e 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -102345,18 +93680,10 @@ index 2d2eeaea1294..0acf53f14d5e 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 6968afccd46e..8dcf86ee10b7 100644
+index 611cef5f0aa9..7ac103b14652 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -102364,6 +93691,7 @@ index 6968afccd46e..8dcf86ee10b7 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -102372,23 +93700,18 @@ index 6968afccd46e..8dcf86ee10b7 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -102407,10 +93730,6 @@ index 6968afccd46e..8dcf86ee10b7 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -102418,10 +93737,6 @@ index 6968afccd46e..8dcf86ee10b7 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -102429,7 +93744,6 @@ index 6968afccd46e..8dcf86ee10b7 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -102437,10 +93751,6 @@ index 6968afccd46e..8dcf86ee10b7 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -102453,10 +93763,6 @@ index 6968afccd46e..8dcf86ee10b7 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -102494,7 +93800,7 @@ index 6968afccd46e..8dcf86ee10b7 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -102552,10 +93858,10 @@ index 6968afccd46e..8dcf86ee10b7 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -102566,10 +93872,10 @@ index 6968afccd46e..8dcf86ee10b7 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -102581,18 +93887,10 @@ index 6968afccd46e..8dcf86ee10b7 100644
Library("repeating_task_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 16b9830a183a..b42f955e4115 100644
+index 4fdd6ceba1cf..cf57b774f7c7 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -102600,6 +93898,7 @@ index 16b9830a183a..b42f955e4115 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -102608,23 +93907,18 @@ index 16b9830a183a..b42f955e4115 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,103 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -102639,10 +93933,6 @@ index 16b9830a183a..b42f955e4115 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -102650,10 +93940,6 @@ index 16b9830a183a..b42f955e4115 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -102661,7 +93947,6 @@ index 16b9830a183a..b42f955e4115 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -102669,10 +93954,6 @@ index 16b9830a183a..b42f955e4115 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -102685,10 +93966,6 @@ index 16b9830a183a..b42f955e4115 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -102719,7 +93996,7 @@ index 16b9830a183a..b42f955e4115 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -150,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -102777,10 +94054,10 @@ index 16b9830a183a..b42f955e4115 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -102791,10 +94068,10 @@ index 16b9830a183a..b42f955e4115 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -102806,18 +94083,10 @@ index 16b9830a183a..b42f955e4115 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 d168d3a09470..98b262c45bf9 100644
+index 4365ae46ca4c..12f8868a8704 100644
--- third_party/libwebrtc/rtc_base/threading_gn/moz.build
+++ third_party/libwebrtc/rtc_base/threading_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -102825,6 +94094,7 @@ index d168d3a09470..98b262c45bf9 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -102833,23 +94103,18 @@ index d168d3a09470..98b262c45bf9 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -49,131 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,110 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -102873,10 +94138,6 @@ index d168d3a09470..98b262c45bf9 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -102888,10 +94149,6 @@ index d168d3a09470..98b262c45bf9 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -102899,7 +94156,6 @@ index d168d3a09470..98b262c45bf9 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -102911,10 +94167,6 @@ index d168d3a09470..98b262c45bf9 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -102927,10 +94179,6 @@ index d168d3a09470..98b262c45bf9 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -102972,7 +94220,7 @@ index d168d3a09470..98b262c45bf9 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -181,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -160,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -103059,18 +94307,10 @@ index d168d3a09470..98b262c45bf9 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 a4a5f263e03c..a9960db995e8 100644
+index 4b8acb938c23..d445327106b5 100644
--- third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
+++ third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
-@@ -9,17 +9,30 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -103078,6 +94318,7 @@ index a4a5f263e03c..a9960db995e8 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_EXCLUDE_SYSTEM_TIME"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
@@ -103087,23 +94328,18 @@ index a4a5f263e03c..a9960db995e8 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -48,114 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -103122,10 +94358,6 @@ index a4a5f263e03c..a9960db995e8 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -103133,10 +94365,6 @@ index a4a5f263e03c..a9960db995e8 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -103144,7 +94372,6 @@ index a4a5f263e03c..a9960db995e8 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -103152,10 +94379,6 @@ index a4a5f263e03c..a9960db995e8 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -103168,10 +94391,6 @@ index a4a5f263e03c..a9960db995e8 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -103209,7 +94428,7 @@ index a4a5f263e03c..a9960db995e8 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -163,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -103267,10 +94486,10 @@ index a4a5f263e03c..a9960db995e8 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -103281,10 +94500,10 @@ index a4a5f263e03c..a9960db995e8 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -103296,7 +94515,7 @@ index a4a5f263e03c..a9960db995e8 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 ea897f3b3845..11ce35fdc349 100644
+index 70461b8aa319..2acfd98eda8a 100644
--- third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
+++ third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -103307,6 +94526,7 @@ index ea897f3b3845..11ce35fdc349 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -103315,13 +94535,12 @@ index ea897f3b3845..11ce35fdc349 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -103356,7 +94575,6 @@ index ea897f3b3845..11ce35fdc349 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -103406,7 +94624,7 @@ index ea897f3b3845..11ce35fdc349 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -103432,7 +94650,7 @@ index ea897f3b3845..11ce35fdc349 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -103474,7 +94692,7 @@ index ea897f3b3845..11ce35fdc349 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 621fccf9d167..9cda58f5bf98 100644
+index 65eeebb09ea9..c37beeccab19 100644
--- third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build
+++ third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -103485,6 +94703,7 @@ index 621fccf9d167..9cda58f5bf98 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -103493,13 +94712,12 @@ index 621fccf9d167..9cda58f5bf98 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -103534,7 +94752,6 @@ index 621fccf9d167..9cda58f5bf98 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -103584,7 +94801,7 @@ index 621fccf9d167..9cda58f5bf98 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -103610,7 +94827,7 @@ index 621fccf9d167..9cda58f5bf98 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -103652,7 +94869,7 @@ index 621fccf9d167..9cda58f5bf98 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 da71deee59ac..7942ee7a0e00 100644
+index f33182ae409a..6b9bd21729b4 100644
--- third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
+++ third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -103663,6 +94880,7 @@ index da71deee59ac..7942ee7a0e00 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -103671,13 +94889,12 @@ index da71deee59ac..7942ee7a0e00 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,87 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -103716,7 +94933,6 @@ index da71deee59ac..7942ee7a0e00 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -103766,7 +94982,7 @@ index da71deee59ac..7942ee7a0e00 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -103792,7 +95008,7 @@ index da71deee59ac..7942ee7a0e00 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -103834,18 +95050,10 @@ index da71deee59ac..7942ee7a0e00 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 1e0c3cb0a7a5..a68f8eae3284 100644
+index ab5a9a7c184c..ba80c70caacb 100644
--- third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
+++ third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -103853,6 +95061,7 @@ index 1e0c3cb0a7a5..a68f8eae3284 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -103861,23 +95070,18 @@ index 1e0c3cb0a7a5..a68f8eae3284 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -103896,10 +95100,6 @@ index 1e0c3cb0a7a5..a68f8eae3284 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -103907,10 +95107,6 @@ index 1e0c3cb0a7a5..a68f8eae3284 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -103918,7 +95114,6 @@ index 1e0c3cb0a7a5..a68f8eae3284 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -103926,10 +95121,6 @@ index 1e0c3cb0a7a5..a68f8eae3284 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -103942,10 +95133,6 @@ index 1e0c3cb0a7a5..a68f8eae3284 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -103976,7 +95163,7 @@ index 1e0c3cb0a7a5..a68f8eae3284 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -104064,10 +95251,10 @@ index 1e0c3cb0a7a5..a68f8eae3284 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 cd55c0c4b4b9..000000000000
+index 6fefcd32d2ce..000000000000
--- third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build
+++ /dev/null
-@@ -1,95 +0,0 @@
+@@ -1,91 +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/.
@@ -104079,10 +95266,6 @@ index cd55c0c4b4b9..000000000000
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
--CXXFLAGS += [
-- "-std:c++20"
--]
--
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
-DEFINES["NOMINMAX"] = True
@@ -104095,6 +95278,7 @@ index cd55c0c4b4b9..000000000000
-DEFINES["UNICODE"] = True
-DEFINES["USE_AURA"] = "1"
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -104111,7 +95295,6 @@ index cd55c0c4b4b9..000000000000
-DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
-DEFINES["_HAS_EXCEPTIONS"] = "0"
-DEFINES["_HAS_NODISCARD"] = True
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
-DEFINES["_SECURE_ATL"] = True
-DEFINES["_UNICODE"] = True
@@ -104165,10 +95348,10 @@ index cd55c0c4b4b9..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 79ff472a7687..000000000000
+index e47a0e579d4a..000000000000
--- third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build
+++ /dev/null
-@@ -1,95 +0,0 @@
+@@ -1,91 +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/.
@@ -104180,10 +95363,6 @@ index 79ff472a7687..000000000000
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
--CXXFLAGS += [
-- "-std:c++20"
--]
--
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
-DEFINES["NOMINMAX"] = True
@@ -104196,6 +95375,7 @@ index 79ff472a7687..000000000000
-DEFINES["UNICODE"] = True
-DEFINES["USE_AURA"] = "1"
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -104212,7 +95392,6 @@ index 79ff472a7687..000000000000
-DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
-DEFINES["_HAS_EXCEPTIONS"] = "0"
-DEFINES["_HAS_NODISCARD"] = True
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
-DEFINES["_SECURE_ATL"] = True
-DEFINES["_UNICODE"] = True
@@ -104266,10 +95445,10 @@ index 79ff472a7687..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 5a69bc248233..000000000000
+index 348b1af0ac91..000000000000
--- third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build
+++ /dev/null
-@@ -1,95 +0,0 @@
+@@ -1,91 +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/.
@@ -104281,10 +95460,6 @@ index 5a69bc248233..000000000000
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
--CXXFLAGS += [
-- "-std:c++20"
--]
--
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
-DEFINES["NOMINMAX"] = True
@@ -104297,6 +95472,7 @@ index 5a69bc248233..000000000000
-DEFINES["UNICODE"] = True
-DEFINES["USE_AURA"] = "1"
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -104313,7 +95489,6 @@ index 5a69bc248233..000000000000
-DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
-DEFINES["_HAS_EXCEPTIONS"] = "0"
-DEFINES["_HAS_NODISCARD"] = True
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
-DEFINES["_SECURE_ATL"] = True
-DEFINES["_UNICODE"] = True
@@ -104367,10 +95542,10 @@ index 5a69bc248233..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 1b6458e538a7..000000000000
+index 0d55a7962fdf..000000000000
--- third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build
+++ /dev/null
-@@ -1,95 +0,0 @@
+@@ -1,91 +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/.
@@ -104382,10 +95557,6 @@ index 1b6458e538a7..000000000000
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
--CXXFLAGS += [
-- "-std:c++20"
--]
--
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
-DEFINES["NOMINMAX"] = True
@@ -104398,6 +95569,7 @@ index 1b6458e538a7..000000000000
-DEFINES["UNICODE"] = True
-DEFINES["USE_AURA"] = "1"
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -104414,7 +95586,6 @@ index 1b6458e538a7..000000000000
-DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
-DEFINES["_HAS_EXCEPTIONS"] = "0"
-DEFINES["_HAS_NODISCARD"] = True
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
-DEFINES["_SECURE_ATL"] = True
-DEFINES["_UNICODE"] = True
@@ -104468,10 +95639,10 @@ index 1b6458e538a7..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 3a9a4aa749ca..000000000000
+index 449ccd350e31..000000000000
--- third_party/libwebrtc/rtc_base/win32_gn/moz.build
+++ /dev/null
-@@ -1,102 +0,0 @@
+@@ -1,98 +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/.
@@ -104483,10 +95654,6 @@ index 3a9a4aa749ca..000000000000
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
--CXXFLAGS += [
-- "-std:c++20"
--]
--
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
-DEFINES["NOMINMAX"] = True
@@ -104499,6 +95666,7 @@ index 3a9a4aa749ca..000000000000
-DEFINES["UNICODE"] = True
-DEFINES["USE_AURA"] = "1"
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -104516,7 +95684,6 @@ index 3a9a4aa749ca..000000000000
-DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
-DEFINES["_HAS_EXCEPTIONS"] = "0"
-DEFINES["_HAS_NODISCARD"] = True
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
-DEFINES["_SECURE_ATL"] = True
-DEFINES["_UNICODE"] = True
@@ -104575,18 +95742,10 @@ index 3a9a4aa749ca..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 89a3b9b196cb..99a72c73a234 100644
+index 4255663efd35..50a0a0266df0 100644
--- third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
+++ third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -104594,6 +95753,7 @@ index 89a3b9b196cb..99a72c73a234 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -104602,23 +95762,18 @@ index 89a3b9b196cb..99a72c73a234 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -104637,10 +95792,6 @@ index 89a3b9b196cb..99a72c73a234 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -104648,10 +95799,6 @@ index 89a3b9b196cb..99a72c73a234 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -104659,7 +95806,6 @@ index 89a3b9b196cb..99a72c73a234 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -104667,10 +95813,6 @@ index 89a3b9b196cb..99a72c73a234 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -104683,10 +95825,6 @@ index 89a3b9b196cb..99a72c73a234 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -104717,7 +95855,7 @@ index 89a3b9b196cb..99a72c73a234 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -104805,7 +95943,7 @@ index 89a3b9b196cb..99a72c73a234 100644
Library("zero_memory_gn")
diff --git third_party/libwebrtc/sdk/base_objc_gn/moz.build third_party/libwebrtc/sdk/base_objc_gn/moz.build
deleted file mode 100644
-index 9b01dffe9772..000000000000
+index 096fecb4c418..000000000000
--- third_party/libwebrtc/sdk/base_objc_gn/moz.build
+++ /dev/null
@@ -1,82 +0,0 @@
@@ -104833,13 +95971,13 @@ index 9b01dffe9772..000000000000
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
-DEFINES["WEBRTC_MAC"] = True
-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
-DEFINES["WEBRTC_POSIX"] = True
-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-DEFINES["__STDC_CONSTANT_MACROS"] = True
-DEFINES["__STDC_FORMAT_MACROS"] = True
-
@@ -104893,7 +96031,7 @@ index 9b01dffe9772..000000000000
-Library("base_objc_gn")
diff --git third_party/libwebrtc/sdk/helpers_objc_gn/moz.build third_party/libwebrtc/sdk/helpers_objc_gn/moz.build
deleted file mode 100644
-index 7e8e518da889..000000000000
+index 3a84d3e3c208..000000000000
--- third_party/libwebrtc/sdk/helpers_objc_gn/moz.build
+++ /dev/null
@@ -1,77 +0,0 @@
@@ -104921,13 +96059,13 @@ index 7e8e518da889..000000000000
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
-DEFINES["WEBRTC_MAC"] = True
-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
-DEFINES["WEBRTC_POSIX"] = True
-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-DEFINES["__STDC_CONSTANT_MACROS"] = True
-DEFINES["__STDC_FORMAT_MACROS"] = True
-
@@ -104976,7 +96114,7 @@ index 7e8e518da889..000000000000
-Library("helpers_objc_gn")
diff --git third_party/libwebrtc/sdk/videocapture_objc_gn/moz.build third_party/libwebrtc/sdk/videocapture_objc_gn/moz.build
deleted file mode 100644
-index 82bb50767500..000000000000
+index fa087172c452..000000000000
--- third_party/libwebrtc/sdk/videocapture_objc_gn/moz.build
+++ /dev/null
@@ -1,72 +0,0 @@
@@ -105000,13 +96138,13 @@ index 82bb50767500..000000000000
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
-DEFINES["WEBRTC_MAC"] = True
-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
-DEFINES["WEBRTC_POSIX"] = True
-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-DEFINES["__STDC_CONSTANT_MACROS"] = True
-DEFINES["__STDC_FORMAT_MACROS"] = True
-
@@ -105054,7 +96192,7 @@ index 82bb50767500..000000000000
-Library("videocapture_objc_gn")
diff --git third_party/libwebrtc/sdk/videoframebuffer_objc_gn/moz.build third_party/libwebrtc/sdk/videoframebuffer_objc_gn/moz.build
deleted file mode 100644
-index 96823fe3a0c6..000000000000
+index 64809b92e3e7..000000000000
--- third_party/libwebrtc/sdk/videoframebuffer_objc_gn/moz.build
+++ /dev/null
@@ -1,75 +0,0 @@
@@ -105078,13 +96216,13 @@ index 96823fe3a0c6..000000000000
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
-DEFINES["WEBRTC_MAC"] = True
-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
-DEFINES["WEBRTC_POSIX"] = True
-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-DEFINES["__STDC_CONSTANT_MACROS"] = True
-DEFINES["__STDC_FORMAT_MACROS"] = True
-
@@ -105134,18 +96272,10 @@ index 96823fe3a0c6..000000000000
-
-Library("videoframebuffer_objc_gn")
diff --git third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
-index 7b22c5d83d57..e30f866c3be3 100644
+index 8181131fd636..82f015feb950 100644
--- third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
+++ third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -105153,6 +96283,7 @@ index 7b22c5d83d57..e30f866c3be3 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -105161,23 +96292,18 @@ index 7b22c5d83d57..e30f866c3be3 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -105196,10 +96322,6 @@ index 7b22c5d83d57..e30f866c3be3 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -105207,10 +96329,6 @@ index 7b22c5d83d57..e30f866c3be3 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -105218,7 +96336,6 @@ index 7b22c5d83d57..e30f866c3be3 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -105226,10 +96343,6 @@ index 7b22c5d83d57..e30f866c3be3 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -105242,10 +96355,6 @@ index 7b22c5d83d57..e30f866c3be3 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -105283,7 +96392,7 @@ index 7b22c5d83d57..e30f866c3be3 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -105341,10 +96450,10 @@ index 7b22c5d83d57..e30f866c3be3 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -105355,10 +96464,10 @@ index 7b22c5d83d57..e30f866c3be3 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -105370,18 +96479,10 @@ index 7b22c5d83d57..e30f866c3be3 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 5efcf4737574..cc9bc9ac01fc 100644
+index 3e1292f36a2a..a9b4f9f9fd1e 100644
--- third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
+++ third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -105389,6 +96490,7 @@ index 5efcf4737574..cc9bc9ac01fc 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -105397,23 +96499,18 @@ index 5efcf4737574..cc9bc9ac01fc 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -105432,10 +96529,6 @@ index 5efcf4737574..cc9bc9ac01fc 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -105443,10 +96536,6 @@ index 5efcf4737574..cc9bc9ac01fc 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -105454,7 +96543,6 @@ index 5efcf4737574..cc9bc9ac01fc 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -105462,10 +96550,6 @@ index 5efcf4737574..cc9bc9ac01fc 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -105478,10 +96562,6 @@ index 5efcf4737574..cc9bc9ac01fc 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -105512,7 +96592,7 @@ index 5efcf4737574..cc9bc9ac01fc 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -105599,18 +96679,10 @@ index 5efcf4737574..cc9bc9ac01fc 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 0b73327eca60..4f3ad6b76fa3 100644
+index 46a6c47b9195..e4744c0609ef 100644
--- third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
+++ third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -105618,6 +96690,7 @@ index 0b73327eca60..4f3ad6b76fa3 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -105626,23 +96699,18 @@ index 0b73327eca60..4f3ad6b76fa3 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -105661,10 +96729,6 @@ index 0b73327eca60..4f3ad6b76fa3 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -105672,10 +96736,6 @@ index 0b73327eca60..4f3ad6b76fa3 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -105683,7 +96743,6 @@ index 0b73327eca60..4f3ad6b76fa3 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -105691,10 +96750,6 @@ index 0b73327eca60..4f3ad6b76fa3 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -105707,10 +96762,6 @@ index 0b73327eca60..4f3ad6b76fa3 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -105748,7 +96799,7 @@ index 0b73327eca60..4f3ad6b76fa3 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -105806,10 +96857,10 @@ index 0b73327eca60..4f3ad6b76fa3 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -105820,10 +96871,10 @@ index 0b73327eca60..4f3ad6b76fa3 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -105835,7 +96886,7 @@ index 0b73327eca60..4f3ad6b76fa3 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 1bccfd79c93a..898ece1e2007 100644
+index 2e86a77b581e..9eae6e64d62d 100644
--- third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
+++ third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -105846,6 +96897,7 @@ index 1bccfd79c93a..898ece1e2007 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -105854,13 +96906,12 @@ index 1bccfd79c93a..898ece1e2007 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,95 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -105900,7 +96951,6 @@ index 1bccfd79c93a..898ece1e2007 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -105957,7 +97007,7 @@ index 1bccfd79c93a..898ece1e2007 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -105983,7 +97033,7 @@ index 1bccfd79c93a..898ece1e2007 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -166,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -106026,10 +97076,10 @@ index 1bccfd79c93a..898ece1e2007 100644
Library("rtp_test_utils_gn")
diff --git third_party/libwebrtc/third_party/cpu_features/ndk_compat_gn/moz.build third_party/libwebrtc/third_party/cpu_features/ndk_compat_gn/moz.build
deleted file mode 100644
-index 75b2e8878e03..000000000000
+index b7d9cb6142bd..000000000000
--- third_party/libwebrtc/third_party/cpu_features/ndk_compat_gn/moz.build
+++ /dev/null
-@@ -1,48 +0,0 @@
+@@ -1,47 +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/.
@@ -106045,7 +97095,6 @@ index 75b2e8878e03..000000000000
-DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
-DEFINES["HAVE_SYS_UIO_H"] = True
-DEFINES["_GNU_SOURCE"] = True
--DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
-DEFINES["__STDC_CONSTANT_MACROS"] = True
-DEFINES["__STDC_FORMAT_MACROS"] = True
@@ -106079,10 +97128,10 @@ index 75b2e8878e03..000000000000
-
-Library("ndk_compat_gn")
diff --git third_party/libwebrtc/third_party/crc32c/crc32c_arm64_gn/moz.build third_party/libwebrtc/third_party/crc32c/crc32c_arm64_gn/moz.build
-index 2d36986a05c5..d4f34c6e8a54 100644
+index a0d1e7a84956..6b30b605cef1 100644
--- third_party/libwebrtc/third_party/crc32c/crc32c_arm64_gn/moz.build
+++ third_party/libwebrtc/third_party/crc32c/crc32c_arm64_gn/moz.build
-@@ -14,7 +14,16 @@ DEFINES["CRC32C_TESTS_BUILT_WITH_GLOG"] = "0"
+@@ -14,6 +14,15 @@ DEFINES["CRC32C_TESTS_BUILT_WITH_GLOG"] = "0"
DEFINES["HAVE_ARM64_CRC32C"] = "0"
DEFINES["HAVE_BUILTIN_PREFETCH"] = "1"
DEFINES["HAVE_SSE42"] = "0"
@@ -106093,13 +97142,12 @@ index 2d36986a05c5..d4f34c6e8a54 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -43,108 +52,24 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,107 +51,24 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -106132,7 +97180,6 @@ index 2d36986a05c5..d4f34c6e8a54 100644
- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_UDEV"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -106209,7 +97256,7 @@ index 2d36986a05c5..d4f34c6e8a54 100644
if CONFIG["TARGET_CPU"] == "ppc64":
-@@ -156,56 +81,14 @@ if CONFIG["TARGET_CPU"] == "riscv64":
+@@ -154,56 +80,14 @@ if CONFIG["TARGET_CPU"] == "riscv64":
if CONFIG["TARGET_CPU"] == "x86":
@@ -106270,10 +97317,10 @@ index 2d36986a05c5..d4f34c6e8a54 100644
Library("crc32c_arm64_gn")
diff --git third_party/libwebrtc/third_party/crc32c/crc32c_gn/moz.build third_party/libwebrtc/third_party/crc32c/crc32c_gn/moz.build
-index a8e6c035310f..ac8e004a6f78 100644
+index 31ce063d9097..a7185ebcf11d 100644
--- third_party/libwebrtc/third_party/crc32c/crc32c_gn/moz.build
+++ third_party/libwebrtc/third_party/crc32c/crc32c_gn/moz.build
-@@ -14,7 +14,16 @@ DEFINES["CRC32C_TESTS_BUILT_WITH_GLOG"] = "0"
+@@ -14,6 +14,15 @@ DEFINES["CRC32C_TESTS_BUILT_WITH_GLOG"] = "0"
DEFINES["HAVE_ARM64_CRC32C"] = "0"
DEFINES["HAVE_BUILTIN_PREFETCH"] = "1"
DEFINES["HAVE_SSE42"] = "0"
@@ -106284,13 +97331,12 @@ index a8e6c035310f..ac8e004a6f78 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -44,108 +53,24 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,107 +52,24 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -106323,7 +97369,6 @@ index a8e6c035310f..ac8e004a6f78 100644
- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_UDEV"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -106400,7 +97445,7 @@ index a8e6c035310f..ac8e004a6f78 100644
if CONFIG["TARGET_CPU"] == "ppc64":
-@@ -157,56 +82,14 @@ if CONFIG["TARGET_CPU"] == "riscv64":
+@@ -155,56 +81,14 @@ if CONFIG["TARGET_CPU"] == "riscv64":
if CONFIG["TARGET_CPU"] == "x86":
@@ -106461,10 +97506,10 @@ index a8e6c035310f..ac8e004a6f78 100644
Library("crc32c_gn")
diff --git third_party/libwebrtc/third_party/crc32c/crc32c_internal_headers_gn/moz.build third_party/libwebrtc/third_party/crc32c/crc32c_internal_headers_gn/moz.build
-index 3ef8dc583670..5420160d3ab5 100644
+index 35330ec53ea7..0ab76c5c37a9 100644
--- third_party/libwebrtc/third_party/crc32c/crc32c_internal_headers_gn/moz.build
+++ third_party/libwebrtc/third_party/crc32c/crc32c_internal_headers_gn/moz.build
-@@ -9,7 +9,14 @@
+@@ -9,6 +9,14 @@
COMPILE_FLAGS["OS_INCLUDES"] = []
AllowCompilerWarnings()
@@ -106473,13 +97518,13 @@ index 3ef8dc583670..5420160d3ab5 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
-
++
FINAL_LIBRARY = "xul"
-@@ -32,121 +39,10 @@ if not CONFIG["MOZ_DEBUG"]:
+
+@@ -30,120 +38,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -106506,7 +97551,6 @@ index 3ef8dc583670..5420160d3ab5 100644
- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_UDEV"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -106603,10 +97647,10 @@ index 3ef8dc583670..5420160d3ab5 100644
-
Library("crc32c_internal_headers_gn")
diff --git third_party/libwebrtc/third_party/crc32c/crc32c_sse42_gn/moz.build third_party/libwebrtc/third_party/crc32c/crc32c_sse42_gn/moz.build
-index 57e79a7f9e44..b855a3042e28 100644
+index b166c70f47e2..dd67af212e47 100644
--- third_party/libwebrtc/third_party/crc32c/crc32c_sse42_gn/moz.build
+++ third_party/libwebrtc/third_party/crc32c/crc32c_sse42_gn/moz.build
-@@ -14,7 +14,16 @@ DEFINES["CRC32C_TESTS_BUILT_WITH_GLOG"] = "0"
+@@ -14,6 +14,15 @@ DEFINES["CRC32C_TESTS_BUILT_WITH_GLOG"] = "0"
DEFINES["HAVE_ARM64_CRC32C"] = "0"
DEFINES["HAVE_BUILTIN_PREFETCH"] = "1"
DEFINES["HAVE_SSE42"] = "0"
@@ -106617,13 +97661,12 @@ index 57e79a7f9e44..b855a3042e28 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -43,108 +52,24 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,107 +51,24 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -106656,7 +97699,6 @@ index 57e79a7f9e44..b855a3042e28 100644
- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_UDEV"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -106733,7 +97775,7 @@ index 57e79a7f9e44..b855a3042e28 100644
if CONFIG["TARGET_CPU"] == "ppc64":
-@@ -156,56 +81,14 @@ if CONFIG["TARGET_CPU"] == "riscv64":
+@@ -154,56 +80,14 @@ if CONFIG["TARGET_CPU"] == "riscv64":
if CONFIG["TARGET_CPU"] == "x86":
@@ -106794,7 +97836,7 @@ index 57e79a7f9e44..b855a3042e28 100644
Library("crc32c_sse42_gn")
diff --git third_party/libwebrtc/third_party/dav1d/dav1d_gn/moz.build third_party/libwebrtc/third_party/dav1d/dav1d_gn/moz.build
-index d7dd3e349440..6839dc4717fa 100644
+index 535f30143955..9b3a8baecfa4 100644
--- third_party/libwebrtc/third_party/dav1d/dav1d_gn/moz.build
+++ third_party/libwebrtc/third_party/dav1d/dav1d_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -106805,6 +97847,7 @@ index d7dd3e349440..6839dc4717fa 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -106813,13 +97856,12 @@ index d7dd3e349440..6839dc4717fa 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -44,83 +53,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,82 +53,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -106854,7 +97896,6 @@ index d7dd3e349440..6839dc4717fa 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -106904,7 +97945,7 @@ index d7dd3e349440..6839dc4717fa 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -128,25 +61,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -127,25 +61,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -106930,7 +97971,7 @@ index d7dd3e349440..6839dc4717fa 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -156,40 +74,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,40 +74,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -106972,7 +98013,7 @@ index d7dd3e349440..6839dc4717fa 100644
-
Library("dav1d_gn")
diff --git third_party/libwebrtc/third_party/libaom/libaom_gn/moz.build third_party/libwebrtc/third_party/libaom/libaom_gn/moz.build
-index 26d729aa4816..9a021575ec73 100644
+index 12c3f72b5b06..f4cc587c8a36 100644
--- third_party/libwebrtc/third_party/libaom/libaom_gn/moz.build
+++ third_party/libwebrtc/third_party/libaom/libaom_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -106983,6 +98024,7 @@ index 26d729aa4816..9a021575ec73 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -106991,13 +98033,12 @@ index 26d729aa4816..9a021575ec73 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -107032,7 +98073,6 @@ index 26d729aa4816..9a021575ec73 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -107082,7 +98122,7 @@ index 26d729aa4816..9a021575ec73 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -107108,7 +98148,7 @@ index 26d729aa4816..9a021575ec73 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -107150,10 +98190,10 @@ index 26d729aa4816..9a021575ec73 100644
-
Library("aom_gn")
diff --git third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build
-index 6f10f838698a..d7ba52dc8024 100644
+index e2c9ea11a576..2a72b5041e77 100644
--- third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build
+++ third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build
-@@ -13,20 +13,16 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,20 +13,17 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -107163,6 +98203,7 @@ index 6f10f838698a..d7ba52dc8024 100644
-DEFINES["USE_UDEV"] = True
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
-DEFINES["WEBRTC_LINUX"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
@@ -107170,12 +98211,11 @@ index 6f10f838698a..d7ba52dc8024 100644
DEFINES["WEBRTC_POSIX"] = True
DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
DEFINES["_FILE_OFFSET_BITS"] = "64"
--DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
-DEFINES["_GNU_SOURCE"] = True
DEFINES["_LARGEFILE64_SOURCE"] = True
DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-@@ -65,12 +61,6 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+ DEFINES["__STDC_CONSTANT_MACROS"] = True
+@@ -64,12 +61,6 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -107189,7 +98229,7 @@ index 6f10f838698a..d7ba52dc8024 100644
DEFINES["MIPS32_LE"] = True
diff --git third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
-index 5ccdff9910f0..746852255f4e 100644
+index d4cfc3821ac8..defbc3e51a23 100644
--- third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
+++ third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -107200,6 +98240,7 @@ index 5ccdff9910f0..746852255f4e 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -107208,13 +98249,12 @@ index 5ccdff9910f0..746852255f4e 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -44,83 +53,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,82 +53,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -107249,7 +98289,6 @@ index 5ccdff9910f0..746852255f4e 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -107299,7 +98338,7 @@ index 5ccdff9910f0..746852255f4e 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -128,25 +61,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -127,25 +61,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -107325,7 +98364,7 @@ index 5ccdff9910f0..746852255f4e 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -156,40 +74,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,40 +74,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -107367,10 +98406,10 @@ index 5ccdff9910f0..746852255f4e 100644
-
Library("yuv_gn")
diff --git third_party/libwebrtc/third_party/opus/opus_gn/moz.build third_party/libwebrtc/third_party/opus/opus_gn/moz.build
-index 2540ef87e331..66d74b90d631 100644
+index bfeaa56b05af..d8e71c4280d9 100644
--- third_party/libwebrtc/third_party/opus/opus_gn/moz.build
+++ third_party/libwebrtc/third_party/opus/opus_gn/moz.build
-@@ -9,7 +9,14 @@
+@@ -9,6 +9,14 @@
COMPILE_FLAGS["OS_INCLUDES"] = []
AllowCompilerWarnings()
@@ -107379,13 +98418,13 @@ index 2540ef87e331..66d74b90d631 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
-
++
FINAL_LIBRARY = "xul"
-@@ -32,121 +39,10 @@ if not CONFIG["MOZ_DEBUG"]:
+
+@@ -30,120 +38,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -107412,7 +98451,6 @@ index 2540ef87e331..66d74b90d631 100644
- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_UDEV"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -107509,10 +98547,10 @@ index 2540ef87e331..66d74b90d631 100644
-
Library("opus_gn")
diff --git third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
-index ad14c77a3fe2..fe9a03bdf63c 100644
+index fa6a7850dc2f..328baf0e1eac 100644
--- third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
+++ third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
-@@ -9,7 +9,14 @@
+@@ -9,6 +9,14 @@
COMPILE_FLAGS["OS_INCLUDES"] = []
AllowCompilerWarnings()
@@ -107521,13 +98559,13 @@ index ad14c77a3fe2..fe9a03bdf63c 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
-
++
FINAL_LIBRARY = "xul"
-@@ -36,96 +43,23 @@ if not CONFIG["MOZ_DEBUG"]:
+
+@@ -34,95 +42,23 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -107554,7 +98592,6 @@ index ad14c77a3fe2..fe9a03bdf63c 100644
- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_UDEV"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -107625,7 +98662,7 @@ index ad14c77a3fe2..fe9a03bdf63c 100644
if CONFIG["TARGET_CPU"] == "ppc64":
-@@ -135,50 +69,10 @@ if CONFIG["TARGET_CPU"] == "riscv64":
+@@ -132,50 +68,10 @@ if CONFIG["TARGET_CPU"] == "riscv64":
DEFINES["PFFFT_SIMD_DISABLE"] = True
@@ -107678,10 +98715,10 @@ index ad14c77a3fe2..fe9a03bdf63c 100644
-
Library("pffft_gn")
diff --git third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
-index fc239a9d7eae..541de9c16824 100644
+index 11dbf4942190..d44acce8cafa 100644
--- third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
+++ third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
-@@ -9,7 +9,14 @@
+@@ -9,6 +9,14 @@
COMPILE_FLAGS["OS_INCLUDES"] = []
AllowCompilerWarnings()
@@ -107690,13 +98727,13 @@ index fc239a9d7eae..541de9c16824 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
-
++
FINAL_LIBRARY = "xul"
-@@ -36,137 +43,16 @@ if not CONFIG["MOZ_DEBUG"]:
+
+@@ -34,136 +42,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -107723,7 +98760,6 @@ index fc239a9d7eae..541de9c16824 100644
- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_UDEV"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -107837,18 +98873,10 @@ index fc239a9d7eae..541de9c16824 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 3fdd6f82a882..d8565e99f4fc 100644
+index 63fce4361b2b..dad5ed7fa01c 100644
--- third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
+++ third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -107856,6 +98884,7 @@ index 3fdd6f82a882..d8565e99f4fc 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -107864,23 +98893,18 @@ index 3fdd6f82a882..d8565e99f4fc 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -54,115 +67,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,94 +63,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -107900,10 +98924,6 @@ index 3fdd6f82a882..d8565e99f4fc 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -107911,10 +98931,6 @@ index 3fdd6f82a882..d8565e99f4fc 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -107922,7 +98938,6 @@ index 3fdd6f82a882..d8565e99f4fc 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -107930,10 +98945,6 @@ index 3fdd6f82a882..d8565e99f4fc 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -107946,10 +98957,6 @@ index 3fdd6f82a882..d8565e99f4fc 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -107987,7 +98994,7 @@ index 3fdd6f82a882..d8565e99f4fc 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -170,82 +75,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -149,82 +71,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -108045,10 +99052,10 @@ index 3fdd6f82a882..d8565e99f4fc 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -108059,10 +99066,10 @@ index 3fdd6f82a882..d8565e99f4fc 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -108074,18 +99081,10 @@ index 3fdd6f82a882..d8565e99f4fc 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 865900b598de..0fc614829ce7 100644
+index 74145a92544d..22716e70e484 100644
--- third_party/libwebrtc/video/config/encoder_config_gn/moz.build
+++ third_party/libwebrtc/video/config/encoder_config_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -108093,6 +99092,7 @@ index 865900b598de..0fc614829ce7 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -108101,23 +99101,18 @@ index 865900b598de..0fc614829ce7 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -108136,10 +99131,6 @@ index 865900b598de..0fc614829ce7 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -108147,10 +99138,6 @@ index 865900b598de..0fc614829ce7 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -108158,7 +99145,6 @@ index 865900b598de..0fc614829ce7 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -108166,10 +99152,6 @@ index 865900b598de..0fc614829ce7 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -108182,10 +99164,6 @@ index 865900b598de..0fc614829ce7 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -108223,7 +99201,7 @@ index 865900b598de..0fc614829ce7 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -108281,10 +99259,10 @@ index 865900b598de..0fc614829ce7 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -108295,10 +99273,10 @@ index 865900b598de..0fc614829ce7 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -108310,18 +99288,10 @@ index 865900b598de..0fc614829ce7 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 9275bcc0855a..9bfb207645ac 100644
+index 8bce9bd5ba2a..e266ecab0cd5 100644
--- third_party/libwebrtc/video/config/streams_config_gn/moz.build
+++ third_party/libwebrtc/video/config/streams_config_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -108329,6 +99299,7 @@ index 9275bcc0855a..9bfb207645ac 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -108337,23 +99308,18 @@ index 9275bcc0855a..9bfb207645ac 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -47,115 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -108373,10 +99339,6 @@ index 9275bcc0855a..9bfb207645ac 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -108384,10 +99346,6 @@ index 9275bcc0855a..9bfb207645ac 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -108395,7 +99353,6 @@ index 9275bcc0855a..9bfb207645ac 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -108403,10 +99360,6 @@ index 9275bcc0855a..9bfb207645ac 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -108419,10 +99372,6 @@ index 9275bcc0855a..9bfb207645ac 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -108460,7 +99409,7 @@ index 9275bcc0855a..9bfb207645ac 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -163,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -108518,10 +99467,10 @@ index 9275bcc0855a..9bfb207645ac 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -108532,10 +99481,10 @@ index 9275bcc0855a..9bfb207645ac 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -108547,18 +99496,10 @@ index 9275bcc0855a..9bfb207645ac 100644
Library("streams_config_gn")
diff --git third_party/libwebrtc/video/corruption_detection/corruption_classifier_gn/moz.build third_party/libwebrtc/video/corruption_detection/corruption_classifier_gn/moz.build
-index eab5fabcf870..8bedde4c3fa7 100644
+index 5a77553e544c..0a93ce3fe690 100644
--- third_party/libwebrtc/video/corruption_detection/corruption_classifier_gn/moz.build
+++ third_party/libwebrtc/video/corruption_detection/corruption_classifier_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -108566,6 +99507,7 @@ index eab5fabcf870..8bedde4c3fa7 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -108574,23 +99516,18 @@ index eab5fabcf870..8bedde4c3fa7 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -108609,10 +99546,6 @@ index eab5fabcf870..8bedde4c3fa7 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -108620,10 +99553,6 @@ index eab5fabcf870..8bedde4c3fa7 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -108631,7 +99560,6 @@ index eab5fabcf870..8bedde4c3fa7 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -108639,10 +99567,6 @@ index eab5fabcf870..8bedde4c3fa7 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -108655,10 +99579,6 @@ index eab5fabcf870..8bedde4c3fa7 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -108696,7 +99616,7 @@ index eab5fabcf870..8bedde4c3fa7 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -108754,260 +99674,24 @@ index eab5fabcf870..8bedde4c3fa7 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
--
-- DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
--
-- DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
--
CXXFLAGS += [
"-msse2"
]
-- DEFINES["_GNU_SOURCE"] = True
-+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["TARGET_CPU"] == "x86_64":
-
-- DEFINES["_GNU_SOURCE"] = True
-+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
- Library("corruption_classifier_gn")
-diff --git third_party/libwebrtc/video/corruption_detection/frame_instrumentation_evaluation_gn/moz.build third_party/libwebrtc/video/corruption_detection/frame_instrumentation_evaluation_gn/moz.build
-index 9faf5b89eb15..1d6aa6fbe092 100644
---- third_party/libwebrtc/video/corruption_detection/frame_instrumentation_evaluation_gn/moz.build
-+++ third_party/libwebrtc/video/corruption_detection/frame_instrumentation_evaluation_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
- DEFINES["RTC_ENABLE_VP9"] = True
-+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_OZONE"] = "1"
-+DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
-+DEFINES["WEBRTC_POSIX"] = True
- DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
-+DEFINES["_FILE_OFFSET_BITS"] = "64"
-+DEFINES["_LARGEFILE64_SOURCE"] = True
-+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-+DEFINES["__STDC_CONSTANT_MACROS"] = True
-+DEFINES["__STDC_FORMAT_MACROS"] = True
-
- FINAL_LIBRARY = "xul"
-
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
- if CONFIG["MOZ_DEBUG"] == "1":
-
- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
--
--if CONFIG["OS_TARGET"] == "Android":
--
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
-- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
-- DEFINES["HAVE_SYS_UIO_H"] = True
-- DEFINES["WEBRTC_ANDROID"] = True
-- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-- DEFINES["WEBRTC_LINUX"] = True
-- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["_GNU_SOURCE"] = True
-- DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
-- DEFINES["__STDC_CONSTANT_MACROS"] = True
-- DEFINES["__STDC_FORMAT_MACROS"] = True
--
-- OS_LIBS += [
-- "log"
-- ]
--
--if CONFIG["OS_TARGET"] == "Darwin":
--
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
-- DEFINES["WEBRTC_MAC"] = True
-- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["__STDC_CONSTANT_MACROS"] = True
-- DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "Linux":
--
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
-- DEFINES["USE_AURA"] = "1"
-- DEFINES["USE_GLIB"] = "1"
-- DEFINES["USE_OZONE"] = "1"
-- DEFINES["USE_UDEV"] = True
-- DEFINES["WEBRTC_LINUX"] = True
-- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
-- DEFINES["_LARGEFILE64_SOURCE"] = True
-- DEFINES["_LARGEFILE_SOURCE"] = True
-- DEFINES["__STDC_CONSTANT_MACROS"] = True
-- DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "OpenBSD":
--
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
-- DEFINES["USE_GLIB"] = "1"
-- DEFINES["USE_OZONE"] = "1"
-- DEFINES["WEBRTC_BSD"] = True
-- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_LARGEFILE64_SOURCE"] = True
-- DEFINES["_LARGEFILE_SOURCE"] = True
-- DEFINES["__STDC_CONSTANT_MACROS"] = True
-- DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "WINNT":
--
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
-- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
-- DEFINES["NOMINMAX"] = True
-- DEFINES["NTDDI_VERSION"] = "0x0A000000"
-- DEFINES["PSAPI_VERSION"] = "2"
-- DEFINES["RTC_ENABLE_WIN_WGC"] = True
-- DEFINES["UNICODE"] = True
-- DEFINES["USE_AURA"] = "1"
-- DEFINES["WEBRTC_WIN"] = True
-- DEFINES["WIN32"] = True
-- DEFINES["WIN32_LEAN_AND_MEAN"] = True
-- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
-- DEFINES["WINVER"] = "0x0A00"
-- DEFINES["_ATL_NO_OPENGL"] = True
-- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
-- DEFINES["_CRT_RAND_S"] = True
-- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
-- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
-- DEFINES["_HAS_EXCEPTIONS"] = "0"
-- DEFINES["_HAS_NODISCARD"] = True
-- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
-- DEFINES["_SECURE_ATL"] = True
-- DEFINES["_UNICODE"] = True
-- DEFINES["_WIN32_WINNT"] = "0x0A00"
-- DEFINES["_WINDOWS"] = True
-- DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
-- DEFINES["__STD_C"] = True
--
-- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
-- "winmm"
-- ]
-+ DEFINES["_DEBUG"] = True
-
- if CONFIG["TARGET_CPU"] == "aarch64":
-
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
- DEFINES["WEBRTC_HAS_NEON"] = True
- DEFINES["__ARM_NEON__"] = "1"
-
--if CONFIG["TARGET_CPU"] == "arm":
--
-- CXXFLAGS += [
-- "-mfpu=neon"
-- ]
--
-- DEFINES["WEBRTC_ARCH_ARM"] = True
-- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
-- DEFINES["WEBRTC_HAS_NEON"] = True
--
--if CONFIG["TARGET_CPU"] == "loongarch64":
--
-- DEFINES["_GNU_SOURCE"] = True
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- if CONFIG["TARGET_CPU"] == "mips32":
-
- DEFINES["MIPS32_LE"] = True
- DEFINES["MIPS_FPU_LE"] = True
- DEFINES["_GNU_SOURCE"] = True
-
--if CONFIG["TARGET_CPU"] == "mips64":
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
-
- DEFINES["_GNU_SOURCE"] = True
-
- if CONFIG["TARGET_CPU"] == "x86":
-
-- DEFINES["WEBRTC_ENABLE_AVX2"] = True
--
--if CONFIG["TARGET_CPU"] == "x86_64":
--
-- DEFINES["WEBRTC_ENABLE_AVX2"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
--
-- DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
--
-- DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
-- DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
-- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
--
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
--
-- DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
--
-- DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
--
- CXXFLAGS += [
- "-msse2"
- ]
-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -109017,20 +99701,12 @@ index 9faf5b89eb15..1d6aa6fbe092 100644
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- Library("frame_instrumentation_evaluation_gn")
+ Library("corruption_classifier_gn")
diff --git third_party/libwebrtc/video/corruption_detection/frame_instrumentation_generator_gn/moz.build third_party/libwebrtc/video/corruption_detection/frame_instrumentation_generator_gn/moz.build
-index 2fbcadb4ae1c..3ce701b2ec90 100644
+index c97eea9edd89..dc3563b3626c 100644
--- third_party/libwebrtc/video/corruption_detection/frame_instrumentation_generator_gn/moz.build
+++ third_party/libwebrtc/video/corruption_detection/frame_instrumentation_generator_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -109038,6 +99714,7 @@ index 2fbcadb4ae1c..3ce701b2ec90 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -109046,23 +99723,18 @@ index 2fbcadb4ae1c..3ce701b2ec90 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -109082,10 +99754,6 @@ index 2fbcadb4ae1c..3ce701b2ec90 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -109093,10 +99761,6 @@ index 2fbcadb4ae1c..3ce701b2ec90 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -109104,7 +99768,6 @@ index 2fbcadb4ae1c..3ce701b2ec90 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -109112,10 +99775,6 @@ index 2fbcadb4ae1c..3ce701b2ec90 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -109128,10 +99787,6 @@ index 2fbcadb4ae1c..3ce701b2ec90 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -109169,7 +99824,7 @@ index 2fbcadb4ae1c..3ce701b2ec90 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -109227,10 +99882,10 @@ index 2fbcadb4ae1c..3ce701b2ec90 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -109241,10 +99896,10 @@ index 2fbcadb4ae1c..3ce701b2ec90 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -109256,18 +99911,10 @@ index 2fbcadb4ae1c..3ce701b2ec90 100644
Library("frame_instrumentation_generator_gn")
diff --git third_party/libwebrtc/video/corruption_detection/generic_mapping_functions_gn/moz.build third_party/libwebrtc/video/corruption_detection/generic_mapping_functions_gn/moz.build
-index 677bd777b01a..43a2ce5228f6 100644
+index 35e4e34af56e..6e62859f71aa 100644
--- third_party/libwebrtc/video/corruption_detection/generic_mapping_functions_gn/moz.build
+++ third_party/libwebrtc/video/corruption_detection/generic_mapping_functions_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -109275,6 +99922,7 @@ index 677bd777b01a..43a2ce5228f6 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -109283,23 +99931,18 @@ index 677bd777b01a..43a2ce5228f6 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -109318,10 +99961,6 @@ index 677bd777b01a..43a2ce5228f6 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -109329,10 +99968,6 @@ index 677bd777b01a..43a2ce5228f6 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -109340,7 +99975,6 @@ index 677bd777b01a..43a2ce5228f6 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -109348,10 +99982,6 @@ index 677bd777b01a..43a2ce5228f6 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -109364,10 +99994,6 @@ index 677bd777b01a..43a2ce5228f6 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -109405,7 +100031,7 @@ index 677bd777b01a..43a2ce5228f6 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -109463,10 +100089,10 @@ index 677bd777b01a..43a2ce5228f6 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -109477,10 +100103,10 @@ index 677bd777b01a..43a2ce5228f6 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -109492,18 +100118,10 @@ index 677bd777b01a..43a2ce5228f6 100644
Library("generic_mapping_functions_gn")
diff --git third_party/libwebrtc/video/corruption_detection/halton_frame_sampler_gn/moz.build third_party/libwebrtc/video/corruption_detection/halton_frame_sampler_gn/moz.build
-index 319099e20e84..1a0daac76922 100644
+index 37c645c71910..01010a22e813 100644
--- third_party/libwebrtc/video/corruption_detection/halton_frame_sampler_gn/moz.build
+++ third_party/libwebrtc/video/corruption_detection/halton_frame_sampler_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -109511,6 +100129,7 @@ index 319099e20e84..1a0daac76922 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -109519,23 +100138,18 @@ index 319099e20e84..1a0daac76922 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -109554,10 +100168,6 @@ index 319099e20e84..1a0daac76922 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -109565,10 +100175,6 @@ index 319099e20e84..1a0daac76922 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -109576,7 +100182,6 @@ index 319099e20e84..1a0daac76922 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -109584,10 +100189,6 @@ index 319099e20e84..1a0daac76922 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -109600,10 +100201,6 @@ index 319099e20e84..1a0daac76922 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -109641,7 +100238,7 @@ index 319099e20e84..1a0daac76922 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -109699,10 +100296,10 @@ index 319099e20e84..1a0daac76922 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -109713,10 +100310,10 @@ index 319099e20e84..1a0daac76922 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -109728,18 +100325,10 @@ index 319099e20e84..1a0daac76922 100644
Library("halton_frame_sampler_gn")
diff --git third_party/libwebrtc/video/corruption_detection/halton_sequence_gn/moz.build third_party/libwebrtc/video/corruption_detection/halton_sequence_gn/moz.build
-index 9726cf7d3756..85bd3bdd3734 100644
+index 1c216e73bcbc..bd61c3dcb4fe 100644
--- third_party/libwebrtc/video/corruption_detection/halton_sequence_gn/moz.build
+++ third_party/libwebrtc/video/corruption_detection/halton_sequence_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -109747,6 +100336,7 @@ index 9726cf7d3756..85bd3bdd3734 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -109755,23 +100345,18 @@ index 9726cf7d3756..85bd3bdd3734 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,107 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -109790,10 +100375,6 @@ index 9726cf7d3756..85bd3bdd3734 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -109801,10 +100382,6 @@ index 9726cf7d3756..85bd3bdd3734 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -109812,7 +100389,6 @@ index 9726cf7d3756..85bd3bdd3734 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -109820,10 +100396,6 @@ index 9726cf7d3756..85bd3bdd3734 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -109836,10 +100408,6 @@ index 9726cf7d3756..85bd3bdd3734 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -109870,7 +100438,7 @@ index 9726cf7d3756..85bd3bdd3734 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -109957,18 +100525,10 @@ index 9726cf7d3756..85bd3bdd3734 100644
Library("halton_sequence_gn")
diff --git third_party/libwebrtc/video/corruption_detection/video_frame_sampler_gn/moz.build third_party/libwebrtc/video/corruption_detection/video_frame_sampler_gn/moz.build
-index 8c7d63b72a90..f07e23927292 100644
+index 6c81ca519e96..53a0aecf15a7 100644
--- third_party/libwebrtc/video/corruption_detection/video_frame_sampler_gn/moz.build
+++ third_party/libwebrtc/video/corruption_detection/video_frame_sampler_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -109976,6 +100536,7 @@ index 8c7d63b72a90..f07e23927292 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -109984,23 +100545,18 @@ index 8c7d63b72a90..f07e23927292 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -110019,10 +100575,6 @@ index 8c7d63b72a90..f07e23927292 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -110030,10 +100582,6 @@ index 8c7d63b72a90..f07e23927292 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -110041,7 +100589,6 @@ index 8c7d63b72a90..f07e23927292 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -110049,10 +100596,6 @@ index 8c7d63b72a90..f07e23927292 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -110065,10 +100608,6 @@ index 8c7d63b72a90..f07e23927292 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -110106,7 +100645,7 @@ index 8c7d63b72a90..f07e23927292 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -110164,10 +100703,10 @@ index 8c7d63b72a90..f07e23927292 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -110178,10 +100717,10 @@ index 8c7d63b72a90..f07e23927292 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -110193,18 +100732,10 @@ index 8c7d63b72a90..f07e23927292 100644
Library("video_frame_sampler_gn")
diff --git third_party/libwebrtc/video/decode_synchronizer_gn/moz.build third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
-index e5ace8e4fd24..6328ecb27e8a 100644
+index 8d00bc66d4d7..37dd43f219d7 100644
--- third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
+++ third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -110212,6 +100743,7 @@ index e5ace8e4fd24..6328ecb27e8a 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -110220,23 +100752,18 @@ index e5ace8e4fd24..6328ecb27e8a 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -110255,10 +100782,6 @@ index e5ace8e4fd24..6328ecb27e8a 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -110266,10 +100789,6 @@ index e5ace8e4fd24..6328ecb27e8a 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -110277,7 +100796,6 @@ index e5ace8e4fd24..6328ecb27e8a 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -110285,10 +100803,6 @@ index e5ace8e4fd24..6328ecb27e8a 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -110301,10 +100815,6 @@ index e5ace8e4fd24..6328ecb27e8a 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -110342,7 +100852,7 @@ index e5ace8e4fd24..6328ecb27e8a 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -110400,10 +100910,10 @@ index e5ace8e4fd24..6328ecb27e8a 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -110414,10 +100924,10 @@ index e5ace8e4fd24..6328ecb27e8a 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -110429,18 +100939,10 @@ index e5ace8e4fd24..6328ecb27e8a 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 1eb084c24914..569219f68829 100644
+index 0764c59c2ae1..76d308fbc122 100644
--- third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
+++ third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -110448,6 +100950,7 @@ index 1eb084c24914..569219f68829 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -110456,23 +100959,18 @@ index 1eb084c24914..569219f68829 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -110491,10 +100989,6 @@ index 1eb084c24914..569219f68829 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -110502,10 +100996,6 @@ index 1eb084c24914..569219f68829 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -110513,7 +101003,6 @@ index 1eb084c24914..569219f68829 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -110521,10 +101010,6 @@ index 1eb084c24914..569219f68829 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -110537,10 +101022,6 @@ index 1eb084c24914..569219f68829 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -110578,7 +101059,7 @@ index 1eb084c24914..569219f68829 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -110636,10 +101117,10 @@ index 1eb084c24914..569219f68829 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -110650,10 +101131,10 @@ index 1eb084c24914..569219f68829 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -110665,7 +101146,7 @@ index 1eb084c24914..569219f68829 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 0b4bfc8a1ae8..f6086ea6f0de 100644
+index ebfa0cf8e98b..083623da19ed 100644
--- third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
+++ third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -110676,6 +101157,7 @@ index 0b4bfc8a1ae8..f6086ea6f0de 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -110684,13 +101166,12 @@ index 0b4bfc8a1ae8..f6086ea6f0de 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -110729,7 +101210,6 @@ index 0b4bfc8a1ae8..f6086ea6f0de 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -110786,7 +101266,7 @@ index 0b4bfc8a1ae8..f6086ea6f0de 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -110812,7 +101292,7 @@ index 0b4bfc8a1ae8..f6086ea6f0de 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -110854,18 +101334,10 @@ index 0b4bfc8a1ae8..f6086ea6f0de 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 d7c80a733fd3..56cb34a1dc91 100644
+index dff6817185a6..a6391ed1d6d9 100644
--- third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
+++ third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -110873,6 +101345,7 @@ index d7c80a733fd3..56cb34a1dc91 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -110881,23 +101354,18 @@ index d7c80a733fd3..56cb34a1dc91 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -110916,10 +101384,6 @@ index d7c80a733fd3..56cb34a1dc91 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -110927,10 +101391,6 @@ index d7c80a733fd3..56cb34a1dc91 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -110938,7 +101398,6 @@ index d7c80a733fd3..56cb34a1dc91 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -110946,10 +101405,6 @@ index d7c80a733fd3..56cb34a1dc91 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -110962,10 +101417,6 @@ index d7c80a733fd3..56cb34a1dc91 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -111003,7 +101454,7 @@ index d7c80a733fd3..56cb34a1dc91 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -111061,10 +101512,10 @@ index d7c80a733fd3..56cb34a1dc91 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -111075,10 +101526,10 @@ index d7c80a733fd3..56cb34a1dc91 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -111090,18 +101541,10 @@ index d7c80a733fd3..56cb34a1dc91 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 12f88753ca39..65d2fa878456 100644
+index 227df191f979..60e92d4b43b8 100644
--- third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
+++ third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -111109,6 +101552,7 @@ index 12f88753ca39..65d2fa878456 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -111117,23 +101561,18 @@ index 12f88753ca39..65d2fa878456 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -111153,10 +101592,6 @@ index 12f88753ca39..65d2fa878456 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -111164,10 +101599,6 @@ index 12f88753ca39..65d2fa878456 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -111175,7 +101606,6 @@ index 12f88753ca39..65d2fa878456 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -111183,10 +101613,6 @@ index 12f88753ca39..65d2fa878456 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -111199,10 +101625,6 @@ index 12f88753ca39..65d2fa878456 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -111240,7 +101662,7 @@ index 12f88753ca39..65d2fa878456 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -111298,10 +101720,10 @@ index 12f88753ca39..65d2fa878456 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -111312,10 +101734,10 @@ index 12f88753ca39..65d2fa878456 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -111327,18 +101749,10 @@ index 12f88753ca39..65d2fa878456 100644
Library("frame_dumping_decoder_gn")
diff --git third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build
-index 811efba89652..1fa679c578b7 100644
+index 8d0c58f78dc2..e80fc74c8dfc 100644
--- third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build
+++ third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -111346,6 +101760,7 @@ index 811efba89652..1fa679c578b7 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -111354,23 +101769,18 @@ index 811efba89652..1fa679c578b7 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -111390,10 +101800,6 @@ index 811efba89652..1fa679c578b7 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -111401,10 +101807,6 @@ index 811efba89652..1fa679c578b7 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -111412,7 +101814,6 @@ index 811efba89652..1fa679c578b7 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -111420,10 +101821,6 @@ index 811efba89652..1fa679c578b7 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -111436,10 +101833,6 @@ index 811efba89652..1fa679c578b7 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -111477,7 +101870,7 @@ index 811efba89652..1fa679c578b7 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -111535,10 +101928,10 @@ index 811efba89652..1fa679c578b7 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -111549,10 +101942,10 @@ index 811efba89652..1fa679c578b7 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -111564,18 +101957,10 @@ index 811efba89652..1fa679c578b7 100644
Library("frame_dumping_encoder_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 4055e4dc4653..8ce066226533 100644
+index 4635e7a8e62f..0611183c55ca 100644
--- third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build
+++ third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -111583,6 +101968,7 @@ index 4055e4dc4653..8ce066226533 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -111591,23 +101977,18 @@ index 4055e4dc4653..8ce066226533 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -111626,10 +102007,6 @@ index 4055e4dc4653..8ce066226533 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -111637,10 +102014,6 @@ index 4055e4dc4653..8ce066226533 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -111648,7 +102021,6 @@ index 4055e4dc4653..8ce066226533 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -111656,10 +102028,6 @@ index 4055e4dc4653..8ce066226533 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -111672,10 +102040,6 @@ index 4055e4dc4653..8ce066226533 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -111713,7 +102077,7 @@ index 4055e4dc4653..8ce066226533 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -111771,10 +102135,10 @@ index 4055e4dc4653..8ce066226533 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -111785,10 +102149,10 @@ index 4055e4dc4653..8ce066226533 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -111800,18 +102164,10 @@ index 4055e4dc4653..8ce066226533 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 2af35e613160..a78a18cf5e01 100644
+index d0063c8e73d3..a4d236fc549c 100644
--- third_party/libwebrtc/video/render/video_render_frames_gn/moz.build
+++ third_party/libwebrtc/video/render/video_render_frames_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -111819,6 +102175,7 @@ index 2af35e613160..a78a18cf5e01 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -111827,23 +102184,18 @@ index 2af35e613160..a78a18cf5e01 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -111862,10 +102214,6 @@ index 2af35e613160..a78a18cf5e01 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -111873,10 +102221,6 @@ index 2af35e613160..a78a18cf5e01 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -111884,7 +102228,6 @@ index 2af35e613160..a78a18cf5e01 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -111892,10 +102235,6 @@ index 2af35e613160..a78a18cf5e01 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -111908,10 +102247,6 @@ index 2af35e613160..a78a18cf5e01 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -111949,7 +102284,7 @@ index 2af35e613160..a78a18cf5e01 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -112007,10 +102342,10 @@ index 2af35e613160..a78a18cf5e01 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -112021,10 +102356,10 @@ index 2af35e613160..a78a18cf5e01 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -112036,18 +102371,10 @@ index 2af35e613160..a78a18cf5e01 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 dc552260ed86..ee34a129be13 100644
+index ab2e1394bc6f..17b977e8823b 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -112055,6 +102382,7 @@ index dc552260ed86..ee34a129be13 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -112063,23 +102391,18 @@ index dc552260ed86..ee34a129be13 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -112098,10 +102421,6 @@ index dc552260ed86..ee34a129be13 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -112109,10 +102428,6 @@ index dc552260ed86..ee34a129be13 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -112120,7 +102435,6 @@ index dc552260ed86..ee34a129be13 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -112128,10 +102442,6 @@ index dc552260ed86..ee34a129be13 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -112144,10 +102454,6 @@ index dc552260ed86..ee34a129be13 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -112185,7 +102491,7 @@ index dc552260ed86..ee34a129be13 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -112243,10 +102549,10 @@ index dc552260ed86..ee34a129be13 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -112257,10 +102563,10 @@ index dc552260ed86..ee34a129be13 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -112272,18 +102578,10 @@ index dc552260ed86..ee34a129be13 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 3b6c61cda5ce..af781f74d81b 100644
+index a18e7c809be4..15326cffbbdd 100644
--- third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build
+++ third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -112291,6 +102589,7 @@ index 3b6c61cda5ce..af781f74d81b 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -112299,23 +102598,18 @@ index 3b6c61cda5ce..af781f74d81b 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,103 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -112330,10 +102624,6 @@ index 3b6c61cda5ce..af781f74d81b 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -112341,10 +102631,6 @@ index 3b6c61cda5ce..af781f74d81b 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -112352,7 +102638,6 @@ index 3b6c61cda5ce..af781f74d81b 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -112360,10 +102645,6 @@ index 3b6c61cda5ce..af781f74d81b 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -112376,10 +102657,6 @@ index 3b6c61cda5ce..af781f74d81b 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -112410,7 +102687,7 @@ index 3b6c61cda5ce..af781f74d81b 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -150,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -112468,10 +102745,10 @@ index 3b6c61cda5ce..af781f74d81b 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -112482,10 +102759,10 @@ index 3b6c61cda5ce..af781f74d81b 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -112497,18 +102774,10 @@ index 3b6c61cda5ce..af781f74d81b 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 20305674dedd..1525bb334eb9 100644
+index bf9570a50f61..852d85724b5a 100644
--- third_party/libwebrtc/video/video_gn/moz.build
+++ third_party/libwebrtc/video/video_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -112516,6 +102785,7 @@ index 20305674dedd..1525bb334eb9 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -112524,23 +102794,18 @@ index 20305674dedd..1525bb334eb9 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -65,115 +78,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -65,94 +74,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -112560,10 +102825,6 @@ index 20305674dedd..1525bb334eb9 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -112571,10 +102832,6 @@ index 20305674dedd..1525bb334eb9 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -112582,7 +102839,6 @@ index 20305674dedd..1525bb334eb9 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -112590,10 +102846,6 @@ index 20305674dedd..1525bb334eb9 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -112606,10 +102858,6 @@ index 20305674dedd..1525bb334eb9 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -112647,7 +102895,7 @@ index 20305674dedd..1525bb334eb9 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -181,82 +86,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -160,82 +82,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -112705,10 +102953,10 @@ index 20305674dedd..1525bb334eb9 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -112719,10 +102967,10 @@ index 20305674dedd..1525bb334eb9 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -112734,18 +102982,10 @@ index 20305674dedd..1525bb334eb9 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 bc2d0a143361..c6e4d36f8444 100644
+index 5b7cfa965acb..870f098f8f00 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
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -112753,6 +102993,7 @@ index bc2d0a143361..c6e4d36f8444 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -112761,23 +103002,18 @@ index bc2d0a143361..c6e4d36f8444 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,114 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -112796,10 +103032,6 @@ index bc2d0a143361..c6e4d36f8444 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -112807,10 +103039,6 @@ index bc2d0a143361..c6e4d36f8444 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -112818,7 +103046,6 @@ index bc2d0a143361..c6e4d36f8444 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -112826,10 +103053,6 @@ index bc2d0a143361..c6e4d36f8444 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -112842,10 +103065,6 @@ index bc2d0a143361..c6e4d36f8444 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -112883,7 +103102,7 @@ index bc2d0a143361..c6e4d36f8444 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -112941,10 +103160,10 @@ index bc2d0a143361..c6e4d36f8444 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -112955,10 +103174,10 @@ index bc2d0a143361..c6e4d36f8444 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -112970,18 +103189,10 @@ index bc2d0a143361..c6e4d36f8444 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 f52787a08fce..253db3b836e7 100644
+index 546b31db87d2..c8a455a621d5 100644
--- third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build
+++ third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -112989,6 +103200,7 @@ index f52787a08fce..253db3b836e7 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -112997,23 +103209,18 @@ index f52787a08fce..253db3b836e7 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -46,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -113033,10 +103240,6 @@ index f52787a08fce..253db3b836e7 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -113044,10 +103247,6 @@ index f52787a08fce..253db3b836e7 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -113055,7 +103254,6 @@ index f52787a08fce..253db3b836e7 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -113063,10 +103261,6 @@ index f52787a08fce..253db3b836e7 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -113079,10 +103273,6 @@ index f52787a08fce..253db3b836e7 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -113120,7 +103310,7 @@ index f52787a08fce..253db3b836e7 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -113178,10 +103368,10 @@ index f52787a08fce..253db3b836e7 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -113192,10 +103382,10 @@ index f52787a08fce..253db3b836e7 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -113207,18 +103397,10 @@ index f52787a08fce..253db3b836e7 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 25ef4221b6be..09291af07481 100644
+index 361043fbfbf9..ef4b2d0642b2 100644
--- third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
+++ third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
-@@ -9,16 +9,29 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-
-+CXXFLAGS += [
-+ "-std=gnu++20"
-+]
-+
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -113226,6 +103408,7 @@ index 25ef4221b6be..09291af07481 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -113234,23 +103417,18 @@ index 25ef4221b6be..09291af07481 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -54,115 +67,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,94 +63,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
@@ -113270,10 +103448,6 @@ index 25ef4221b6be..09291af07481 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -113281,10 +103455,6 @@ index 25ef4221b6be..09291af07481 100644
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
@@ -113292,7 +103462,6 @@ index 25ef4221b6be..09291af07481 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -113300,10 +103469,6 @@ index 25ef4221b6be..09291af07481 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-std=gnu++20"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
@@ -113316,10 +103481,6 @@ index 25ef4221b6be..09291af07481 100644
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-- CXXFLAGS += [
-- "-std:c++20"
-- ]
--
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
@@ -113357,7 +103518,7 @@ index 25ef4221b6be..09291af07481 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -170,82 +75,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -149,82 +71,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -113415,10 +103576,10 @@ index 25ef4221b6be..09291af07481 100644
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -113429,10 +103590,10 @@ index 25ef4221b6be..09291af07481 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -113444,7 +103605,7 @@ index 25ef4221b6be..09291af07481 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 89ad79e33a09..17f77a8bcf9e 100644
+index 2fde9b415646..e25edf163bd7 100644
--- third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build
+++ third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -113455,6 +103616,7 @@ index 89ad79e33a09..17f77a8bcf9e 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -113463,13 +103625,12 @@ index 89ad79e33a09..17f77a8bcf9e 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -113508,7 +103669,6 @@ index 89ad79e33a09..17f77a8bcf9e 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -113565,7 +103725,7 @@ index 89ad79e33a09..17f77a8bcf9e 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -113591,7 +103751,7 @@ index 89ad79e33a09..17f77a8bcf9e 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -113633,7 +103793,7 @@ index 89ad79e33a09..17f77a8bcf9e 100644
-
Library("video_stream_encoder_interface_gn")
diff --git third_party/libwebrtc/webrtc_gn/moz.build third_party/libwebrtc/webrtc_gn/moz.build
-index 42667b424826..dc7270acb50d 100644
+index ba124401bf6a..1340bec6cba0 100644
--- third_party/libwebrtc/webrtc_gn/moz.build
+++ third_party/libwebrtc/webrtc_gn/moz.build
@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -113644,6 +103804,7 @@ index 42667b424826..dc7270acb50d 100644
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -113652,13 +103813,12 @@ index 42667b424826..dc7270acb50d 100644
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
FINAL_LIBRARY = "xul"
-@@ -42,118 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,117 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -113703,7 +103863,6 @@ index 42667b424826..dc7270acb50d 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -113778,7 +103937,7 @@ index 42667b424826..dc7270acb50d 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -161,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -160,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["__ARM_NEON__"] = "1"
@@ -113804,7 +103963,7 @@ index 42667b424826..dc7270acb50d 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -189,27 +72,7 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -188,27 +72,7 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -113833,7 +103992,7 @@ index 42667b424826..dc7270acb50d 100644
OS_LIBS += [
"X11",
-@@ -221,20 +84,4 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+@@ -220,20 +84,4 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
"Xrender"
]
diff --git a/www/firefox/files/patch-python_sites_mach.txt b/www/firefox/files/patch-python_sites_mach.txt
index 706f285b0731..cc59e963c2de 100644
--- a/www/firefox/files/patch-python_sites_mach.txt
+++ b/www/firefox/files/patch-python_sites_mach.txt
@@ -1,4 +1,4 @@
-commit 10ee367cbe7ff5a19acfcfe3bfb75a49671e4132
+commit 9978044775efea5d7c16949bc4755ce4681fb2f8
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
bump psutil (same as ports)
@@ -6,13 +6,15 @@ Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
5.9.x breaks mach
diff --git python/sites/mach.txt python/sites/mach.txt
-index 6e3db1c848f7..10ba12c2f13b 100644
+index 4769fe11257e..e77870ec4f42 100644
--- python/sites/mach.txt
+++ python/sites/mach.txt
-@@ -108,5 +108,5 @@ pypi-optional:glean-sdk==63.1.0:telemetry will not be collected
+@@ -62,7 +62,7 @@ pypi-optional:orjson>=3.10:json operations will be slower in various tools
# Mach gracefully handles the case where `psutil` is unavailable.
# We aren't (yet) able to pin packages in automation, so we have to
# support down to the oldest locally-installed version (5.4.2).
--pypi-optional:psutil>=5.4.2,<=5.9.4:telemetry will be missing some data
-+pypi-optional:psutil>=5.4.2,<=7.0.0:telemetry will be missing some data
+-pypi-optional:psutil>=5.4.2:telemetry will be missing some data
++pypi-optional:psutil>=5.4.2,<=7.2.0:telemetry will be missing some data
+ pypi-optional:rtoml>=0.11.0:toml operations will be slower in various tools
pypi-optional:zstandard>=0.11.1,<=0.24.0:zstd archives will not be possible to extract
+ vendored-fallback:pyyaml:third_party/python/pyyaml/lib/:faster native loading is disabled
diff --git a/www/freenginx-devel/Makefile b/www/freenginx-devel/Makefile
index c58afecd709e..64e5b8bdfd68 100644
--- a/www/freenginx-devel/Makefile
+++ b/www/freenginx-devel/Makefile
@@ -1,7 +1,7 @@
PORTNAME= freenginx
PORTVERSION= ${NGINX_VERSION}
.include "version.mk"
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= www
MASTER_SITES= https://freenginx.org/download/ \
LOCAL/osa
diff --git a/www/freenginx-devel/Makefile.extmod b/www/freenginx-devel/Makefile.extmod
index f8eb7415537c..99c20f462816 100644
--- a/www/freenginx-devel/Makefile.extmod
+++ b/www/freenginx-devel/Makefile.extmod
@@ -27,7 +27,7 @@ BROTLI_GH_TUPLE= google:ngx_brotli:a71f931:brotli
BROTLI_VARS= DSO_EXTMODS+=brotli
BROTLI_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_brotli_filter_config
-CACHE_PURGE_GH_TUPLE= nginx-modules:ngx_cache_purge:a84b0f3:cache_purge
+CACHE_PURGE_GH_TUPLE= nginx-modules:ngx_cache_purge:2.5.5:cache_purge
CACHE_PURGE_VARS= DSO_EXTMODS+=cache_purge
ECHO_GH_TUPLE= openresty:echo-nginx-module:b0f344b:echo
diff --git a/www/freenginx-devel/distinfo b/www/freenginx-devel/distinfo
index d403f3deb326..fde6dbd88e05 100644
--- a/www/freenginx-devel/distinfo
+++ b/www/freenginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1765911692
+TIMESTAMP = 1767802988
SHA256 (freenginx-1.29.4.tar.gz) = 51a596451e334b51ce8cef1291b576ed601ed557e1b500e6c1a77a469d603e27
SIZE (freenginx-1.29.4.tar.gz) = 1249883
SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -11,8 +11,8 @@ SHA256 (openresty-array-var-nginx-module-v0.06_GH0.tar.gz) = 2c3577265d1d51a2d06
SIZE (openresty-array-var-nginx-module-v0.06_GH0.tar.gz) = 12005
SHA256 (google-ngx_brotli-a71f931_GH0.tar.gz) = b3312a045d5303a40d02beb34711b8ca27f7b72d647e9ee2012a8eddd14d9b22
SIZE (google-ngx_brotli-a71f931_GH0.tar.gz) = 16376
-SHA256 (nginx-modules-ngx_cache_purge-a84b0f3_GH0.tar.gz) = ddfd4fdd99075d906b7b75c49f56ec96b76df7951dfa54502e0f83890447031f
-SIZE (nginx-modules-ngx_cache_purge-a84b0f3_GH0.tar.gz) = 17162
+SHA256 (nginx-modules-ngx_cache_purge-2.5.5_GH0.tar.gz) = 93068d9c5a2a6ebe4966b763cb0033bb5d065210ab96290acc6bf8275625a0a6
+SIZE (nginx-modules-ngx_cache_purge-2.5.5_GH0.tar.gz) = 17299
SHA256 (vision5-ngx_devel_kit-v0.3.4_GH0.tar.gz) = 14a28063294f645d457b1eb10e3c23bbba44398f1c5f021421b58b6f8ab31662
SIZE (vision5-ngx_devel_kit-v0.3.4_GH0.tar.gz) = 66474
SHA256 (openresty-drizzle-nginx-module-c631276_GH0.tar.gz) = 215ebeb3bad3a907f13fbdae66a25939b6820bdba2f339394cbb9c8b8557308a
diff --git a/www/freenginx/Makefile b/www/freenginx/Makefile
index cf2ef0c9bea4..0b6c4a4d884c 100644
--- a/www/freenginx/Makefile
+++ b/www/freenginx/Makefile
@@ -1,6 +1,6 @@
PORTNAME= freenginx
PORTVERSION= 1.28.0
-PORTREVISION?= 6
+PORTREVISION?= 8
CATEGORIES= www
MASTER_SITES= https://freenginx.org/download/ \
LOCAL/joneum
diff --git a/www/freenginx/Makefile.extmod b/www/freenginx/Makefile.extmod
index 6e84e74ec0ef..2213211bfc4b 100644
--- a/www/freenginx/Makefile.extmod
+++ b/www/freenginx/Makefile.extmod
@@ -208,7 +208,7 @@ LUA_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty
LUA_RUN_DEPENDS= lua-resty-core>0:www/lua-resty-core
LUA_CONFIGURE_ENV= LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \
LUAJIT_LIB=${LOCALBASE}/lib
-LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.27:lua
+LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.29:lua
LUA_VARS= DSO_EXTMODS+=lua
LUASTREAM_IMPLIES= DEVEL_KIT
@@ -247,7 +247,7 @@ NJS_XML_IMPLIES= HTTP NJS
NJS_XML_LIB_DEPENDS= libxml2.so:textproc/libxml2 \
libxslt.so:textproc/libxslt
-OTEL_GH_TUPLE= osokin:nginx-otel:8f0857d:otel
+OTEL_GH_TUPLE= osokin:nginx-otel:51273ec:otel
OTEL_VARS= DSO_EXTMODS+=otel OTEL_SUBDIR=/
OTEL_LIB_DEPENDS= libabsl_base.so:devel/abseil \
libcares.so:dns/c-ares \
diff --git a/www/freenginx/distinfo b/www/freenginx/distinfo
index 2ce8cbbb943a..1f976b6051de 100644
--- a/www/freenginx/distinfo
+++ b/www/freenginx/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1762717379
+TIMESTAMP = 1767729768
SHA256 (freenginx-1.28.0.tar.gz) = 28651bf51ff95de027262d7af23000e5862fb3d1b2252ac83d97ce4c9a4a18a2
SIZE (freenginx-1.28.0.tar.gz) = 1228344
SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -93,8 +93,8 @@ SHA256 (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 7393809d5d8877812da1bd5b5f
SIZE (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 20617
SHA256 (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 20c3679199ba7efe1598f03b2fa0b13591226363c8dd7930d7f02702cd5abada
SIZE (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 139656
-SHA256 (openresty-lua-nginx-module-v0.10.27_GH0.tar.gz) = a0a5e616c4a0a32e48899d12242fed5a371f69a85f11ff274a87a2f02f419876
-SIZE (openresty-lua-nginx-module-v0.10.27_GH0.tar.gz) = 758952
+SHA256 (openresty-lua-nginx-module-v0.10.29_GH0.tar.gz) = ca2c2122b909529bf9d1a89e9a5763835a2bd2629def8cb279c550f638f0a78f
+SIZE (openresty-lua-nginx-module-v0.10.29_GH0.tar.gz) = 892502
SHA256 (openresty-stream-lua-nginx-module-v0.0.15_GH0.tar.gz) = ecf5c2afd345149cef19bf2e3e196bf1c514ca85e778f853f80a379284b70de1
SIZE (openresty-stream-lua-nginx-module-v0.0.15_GH0.tar.gz) = 394192
SHA256 (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bfb09a2668f9281d7de6218c7b462a7ba2cee06fe8
@@ -107,8 +107,8 @@ SHA256 (libinjection-libinjection-4aa3894_GH0.tar.gz) = ededea133e89e238ef2e60d0
SIZE (libinjection-libinjection-4aa3894_GH0.tar.gz) = 2218294
SHA256 (nginx-njs-0.9.4_GH0.tar.gz) = 7b3a9f14b0f09311d9031c2a252cb0e23c06baac2e586a7d12c75aa6cba4ca0e
SIZE (nginx-njs-0.9.4_GH0.tar.gz) = 939082
-SHA256 (osokin-nginx-otel-8f0857d_GH0.tar.gz) = bbf93813928460bdaf78f752f74ecc6c34d13078e97fdffcaa29dbd8689314fc
-SIZE (osokin-nginx-otel-8f0857d_GH0.tar.gz) = 30197
+SHA256 (osokin-nginx-otel-51273ec_GH0.tar.gz) = a2107ba0be94c8561ae50773163c7946a58e508be46920f588d05a347c867d9c
+SIZE (osokin-nginx-otel-51273ec_GH0.tar.gz) = 28076
SHA256 (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = c69ad4495de7c7883ebc23e1e6c4cc83a4ac6a7fddd4d5c12e49d33b65f7c50b
SIZE (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = 48544
SHA256 (openresty-rds-csv-nginx-module-v0.09_GH0.tar.gz) = 896be99c0cad50218417800a159e43ec088d6b58c099472ed3b3d7f179d6c0ea
diff --git a/www/garage/Makefile b/www/garage/Makefile
index 4d619be0f3df..7a2e60abcca4 100644
--- a/www/garage/Makefile
+++ b/www/garage/Makefile
@@ -1,6 +1,6 @@
PORTNAME= garage
DISTVERSION= 2.1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= https://git.deuxfleurs.fr/Deuxfleurs/${PORTNAME}/archive/v${PORTVERSION}.tar.gz?dummy=/
DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
diff --git a/www/glpi/Makefile b/www/glpi/Makefile
index 89f06dbaddf6..bb578ca91309 100644
--- a/www/glpi/Makefile
+++ b/www/glpi/Makefile
@@ -1,5 +1,6 @@
PORTNAME= glpi
DISTVERSION= 11.0.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= https://github.com/glpi-project/glpi/releases/download/${DISTVERSION}/
diff --git a/www/gohugo/Makefile b/www/gohugo/Makefile
index 718db01372c8..34590ad70d22 100644
--- a/www/gohugo/Makefile
+++ b/www/gohugo/Makefile
@@ -1,6 +1,6 @@
PORTNAME= hugo
DISTVERSIONPREFIX= v
-DISTVERSION= 0.154.2
+DISTVERSION= 0.154.3
PORTEPOCH= 1
CATEGORIES= www
PKGNAMEPREFIX= go
diff --git a/www/gohugo/distinfo b/www/gohugo/distinfo
index 906e158a3ac1..9ff19af11bf7 100644
--- a/www/gohugo/distinfo
+++ b/www/gohugo/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1767544516
-SHA256 (go/www_gohugo/hugo-v0.154.2/v0.154.2.mod) = e9f59bddae38b7a5507fe9abc618072f8d72fce79a7f46e05b2d21d253b86102
-SIZE (go/www_gohugo/hugo-v0.154.2/v0.154.2.mod) = 9373
-SHA256 (go/www_gohugo/hugo-v0.154.2/v0.154.2.zip) = 680239caef5c832f3fe143c995631c224ca7bb433a302c329a5b8dfd437137f7
-SIZE (go/www_gohugo/hugo-v0.154.2/v0.154.2.zip) = 6996544
+TIMESTAMP = 1767723281
+SHA256 (go/www_gohugo/hugo-v0.154.3/v0.154.3.mod) = 26e4e369f99d33b5dc524fcef38539c083bcb51b24ad9a67d08f918eb80be8fa
+SIZE (go/www_gohugo/hugo-v0.154.3/v0.154.3.mod) = 9373
+SHA256 (go/www_gohugo/hugo-v0.154.3/v0.154.3.zip) = ec2778dacdde5d8bc897242833ad1423778e2786ebf1541939de322a522eb743
+SIZE (go/www_gohugo/hugo-v0.154.3/v0.154.3.zip) = 6996545
diff --git a/www/iridium/Makefile b/www/iridium/Makefile
index a347668bd872..8cf0d8774069 100644
--- a/www/iridium/Makefile
+++ b/www/iridium/Makefile
@@ -1,5 +1,5 @@
PORTNAME= iridium
-PORTVERSION= 2025.12.143.3
+PORTVERSION= 2026.01.143.4
PULSEMV= 16
PULSEV= ${PULSEMV}.1
CATEGORIES= www wayland
diff --git a/www/iridium/distinfo b/www/iridium/distinfo
index 605901164013..7f0cdd15fcb1 100644
--- a/www/iridium/distinfo
+++ b/www/iridium/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1766183891
-SHA256 (iridium-browser-2025.12.143.3.tar.xz) = 33d058038d87b589ea5033a1c6b249d146292ec9d4b4137df06741473680ccee
-SIZE (iridium-browser-2025.12.143.3.tar.xz) = 1098982548
+TIMESTAMP = 1767798109
+SHA256 (iridium-browser-2026.01.143.4.tar.xz) = 635b7a6c0b1d64f17f279428892c00df94742a4836bfdcece385df4f2b6f6fdd
+SIZE (iridium-browser-2026.01.143.4.tar.xz) = 1098976500
SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
SIZE (pulseaudio-16.1.tar.gz) = 2763111
diff --git a/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc b/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc
index 583d8969e189..4b8ade10f443 100644
--- a/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc
+++ b/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/browser/data_manager/payments/payments_data_manager.cc.orig 2025-12-10 15:04:57 UTC
+--- components/autofill/core/browser/data_manager/payments/payments_data_manager.cc.orig 2026-01-07 15:01:47 UTC
+++ components/autofill/core/browser/data_manager/payments/payments_data_manager.cc
-@@ -480,7 +480,7 @@ void PaymentsDataManager::OnWebDataServiceRequestDone(
+@@ -479,7 +479,7 @@ void PaymentsDataManager::OnWebDataServiceRequestDone(
bool PaymentsDataManager::ShouldShowBnplSettings() const {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
// Check `kAutofillEnableBuyNowPayLater` only if the user has seen a BNPL
// suggestion before, or there are already linked issuers present, to avoid
// unnecessary feature flag checks. The linked issuer check is due to the fact
-@@ -1015,7 +1015,7 @@ void PaymentsDataManager::SetPrefService(PrefService*
+@@ -1014,7 +1014,7 @@ void PaymentsDataManager::SetPrefService(PrefService*
&PaymentsDataManager::OnAutofillPaymentsCardBenefitsPrefChange,
base::Unretained(this)));
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +18,7 @@
pref_registrar_.Add(
prefs::kAutofillBnplEnabled,
base::BindRepeating(&PaymentsDataManager::OnBnplEnabledPrefChange,
-@@ -1089,7 +1089,7 @@ void PaymentsDataManager::SetAutofillHasSeenIban() {
+@@ -1088,7 +1088,7 @@ void PaymentsDataManager::SetAutofillHasSeenIban() {
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +27,7 @@
bool PaymentsDataManager::IsAutofillHasSeenBnplPrefEnabled() const {
return prefs::HasSeenBnpl(pref_service_);
}
-@@ -2140,7 +2140,7 @@ bool PaymentsDataManager::AreEwalletAccountsSupported(
+@@ -2139,7 +2139,7 @@ bool PaymentsDataManager::AreEwalletAccountsSupported(
bool PaymentsDataManager::AreBnplIssuersSupported() const {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -36,7 +36,7 @@
return (app_locale_ == "en-US" || app_locale_ == "en-GB" ||
app_locale_ == "en-CA") &&
GetCountryCodeForExperimentGroup() == "US" &&
-@@ -2175,7 +2175,7 @@ void PaymentsDataManager::ClearAllCreditCardBenefits()
+@@ -2174,7 +2174,7 @@ void PaymentsDataManager::ClearAllCreditCardBenefits()
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h b/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h
index f8510af57559..d7dc92a5582c 100644
--- a/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h
+++ b/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h
@@ -1,15 +1,15 @@
---- components/autofill/core/browser/data_manager/payments/payments_data_manager.h.orig 2025-12-10 15:04:57 UTC
+--- components/autofill/core/browser/data_manager/payments/payments_data_manager.h.orig 2026-01-07 15:01:47 UTC
+++ components/autofill/core/browser/data_manager/payments/payments_data_manager.h
-@@ -378,7 +378,7 @@ class PaymentsDataManager : public AutofillWebDataServ
+@@ -377,7 +377,7 @@ class PaymentsDataManager : public AutofillWebDataServ
+ void SetAutofillHasSeenIban();
- // TODO(crbug.com/430575808): Remove build flags.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
// Returns the value of the kAutofillHasSeenBnpl pref.
- virtual bool IsAutofillHasSeenBnplPrefEnabled() const;
+ bool IsAutofillHasSeenBnplPrefEnabled() const;
-@@ -726,7 +726,7 @@ class PaymentsDataManager : public AutofillWebDataServ
+@@ -725,7 +725,7 @@ class PaymentsDataManager : public AutofillWebDataServ
void ClearAllCreditCardBenefits();
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/iridium/files/patch-components_autofill_core_browser_suggestions_payments_payments__suggestion__generator.cc b/www/iridium/files/patch-components_autofill_core_browser_suggestions_payments_payments__suggestion__generator.cc
deleted file mode 100644
index b2c8cd7b4bf6..000000000000
--- a/www/iridium/files/patch-components_autofill_core_browser_suggestions_payments_payments__suggestion__generator.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/autofill/core/browser/suggestions/payments/payments_suggestion_generator.cc.orig 2025-12-10 15:04:57 UTC
-+++ components/autofill/core/browser/suggestions/payments/payments_suggestion_generator.cc
-@@ -1462,7 +1462,7 @@ std::vector<Suggestion> GetCreditCardSuggestionsForTou
- .GetBnplIssuers(),
- /*extracted_amount_in_micros=*/std::nullopt));
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- manager.client()
- .GetPersonalDataManager()
- .payments_data_manager()
diff --git a/www/librewolf/Makefile b/www/librewolf/Makefile
index ddce36213844..faa9addc4592 100644
--- a/www/librewolf/Makefile
+++ b/www/librewolf/Makefile
@@ -1,5 +1,6 @@
PORTNAME= librewolf
DISTVERSION= 146.0.1
+PORTREVISION= 1
LWPATCH= -1
DISTVERSIONSUFFIX= ${LWPATCH}.source
CATEGORIES= www wayland
diff --git a/www/lua-resty-core/Makefile b/www/lua-resty-core/Makefile
index 1c81e982332f..ff9029017179 100644
--- a/www/lua-resty-core/Makefile
+++ b/www/lua-resty-core/Makefile
@@ -1,6 +1,6 @@
PORTNAME= lua-resty-core
DISTVERSIONPREFIX= v
-DISTVERSION= 0.1.31
+DISTVERSION= 0.1.32
CATEGORIES= www
MAINTAINER= zi@FreeBSD.org
diff --git a/www/lua-resty-core/distinfo b/www/lua-resty-core/distinfo
index 9ceb583e86e8..702518b430b7 100644
--- a/www/lua-resty-core/distinfo
+++ b/www/lua-resty-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738601192
-SHA256 (openresty-lua-resty-core-v0.1.31_GH0.tar.gz) = a8af7beadd43dd4758b7dc3c00e027dd3908e73f5bf0e08155a2c8954c5937c0
-SIZE (openresty-lua-resty-core-v0.1.31_GH0.tar.gz) = 225505
+TIMESTAMP = 1767633872
+SHA256 (openresty-lua-resty-core-v0.1.32_GH0.tar.gz) = da0d3f052ac2d0d181cd560e5bbf04a571636be41882a84af9e557cbe88a5104
+SIZE (openresty-lua-resty-core-v0.1.32_GH0.tar.gz) = 253479
diff --git a/www/lua-resty-core/pkg-plist b/www/lua-resty-core/pkg-plist
index b56a23b9a9ed..685a54dfa024 100644
--- a/www/lua-resty-core/pkg-plist
+++ b/www/lua-resty-core/pkg-plist
@@ -10,6 +10,7 @@
%%LUA_MODSHAREDIR%%/ngx/semaphore.lua
%%LUA_MODSHAREDIR%%/ngx/ssl.lua
%%LUA_MODSHAREDIR%%/ngx/ssl/clienthello.lua
+%%LUA_MODSHAREDIR%%/ngx/ssl/proxysslverify.lua
%%LUA_MODSHAREDIR%%/ngx/ssl/session.lua
%%LUA_MODSHAREDIR%%/resty/core.lua
%%LUA_MODSHAREDIR%%/resty/core/base.lua
diff --git a/www/lycheeorg/Makefile b/www/lycheeorg/Makefile
index 0fc3d2a3c1bf..efbd0a2354de 100644
--- a/www/lycheeorg/Makefile
+++ b/www/lycheeorg/Makefile
@@ -1,6 +1,7 @@
PORTNAME= lycheeorg
DISTVERSIONPREFIX= v
DISTVERSION= 6.7.0
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= https://github.com/LycheeOrg/Lychee/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
DISTNAME= Lychee
diff --git a/www/mod_maxminddb/Makefile b/www/mod_maxminddb/Makefile
index efd87d27898f..5f6a2e258483 100644
--- a/www/mod_maxminddb/Makefile
+++ b/www/mod_maxminddb/Makefile
@@ -1,5 +1,5 @@
PORTNAME= mod_maxminddb
-PORTVERSION= 1.2.0
+PORTVERSION= 1.3.0
PORTREVISION= 0
CATEGORIES= www
PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX}
diff --git a/www/mod_maxminddb/distinfo b/www/mod_maxminddb/distinfo
index e406bea5a885..fc3eaeea6e7f 100644
--- a/www/mod_maxminddb/distinfo
+++ b/www/mod_maxminddb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595500825
-SHA256 (maxmind-mod_maxminddb-1.2.0_GH0.tar.gz) = 27d926343a3b548eb7b2f9f5462cacb5a2c9762174b7af6d2c37d5f4e593a9b8
-SIZE (maxmind-mod_maxminddb-1.2.0_GH0.tar.gz) = 26005
+TIMESTAMP = 1767793202
+SHA256 (maxmind-mod_maxminddb-1.3.0_GH0.tar.gz) = 337f2cd556a3ef1eb9bc9b23e3d119444415939cf4d0ec6ae18311bbfd3f0d58
+SIZE (maxmind-mod_maxminddb-1.3.0_GH0.tar.gz) = 27496
diff --git a/www/mod_maxminddb/files/patch-src_Makefile.am b/www/mod_maxminddb/files/patch-src_Makefile.am
index 2c1fd67e675c..8c3466811cbc 100644
--- a/www/mod_maxminddb/files/patch-src_Makefile.am
+++ b/www/mod_maxminddb/files/patch-src_Makefile.am
@@ -1,6 +1,6 @@
---- src/Makefile.am.orig 2016-10-19 20:07:32 UTC
-+++ src/Makefile.am
-@@ -1,15 +1,16 @@
+--- src/Makefile.am.orig 2026-01-07 15:00:22.589270000 +0100
++++ src/Makefile.am 2026-01-07 15:02:24.650819000 +0100
+@@ -1,15 +1,16 @@ WC=-Wc,"$(CFLAGS)"
AUTOMAKE_OPTIONS = foreign
WC=-Wc,"$(CFLAGS)"
+WL=-Wl,"$(LDFLAGS)"
@@ -15,7 +15,7 @@
install-exec-local: module
- $(APXS) -i -a -n maxminddb .libs/mod_maxminddb.so
-+ $(APXS) -S LIBEXECDIR=%%LIBEXECDEST%% -i -a -n maxminddb mod_maxminddb.la ### maxminddb .libs/mod_maxminddb.so
++ $(APXS) -S LIBEXECDIR=%%LIBEXECDEST%% -i -n maxminddb mod_maxminddb.la
CLEANFILES= *.la *.lo *.o *.so *.slo .libs/*
diff --git a/www/mod_maxminddb/pkg-message b/www/mod_maxminddb/pkg-message
new file mode 100644
index 000000000000..a6777643574f
--- /dev/null
+++ b/www/mod_maxminddb/pkg-message
@@ -0,0 +1,19 @@
+[
+{ type: install
+ message: <<EOM
+To enable mod_maxminddb in Apache, add the following line to your Apache configuration:
+
+ LoadModule maxminddb_module libexec/apache24/mod_maxminddb.so
+
+A common way on FreeBSD is to create a separate file, for example:
+
+ /usr/local/etc/apache24/modules.d/270_maxminddb.conf
+
+and put the LoadModule line there.
+
+After enabling the module, restart Apache:
+
+ service apache24 restart
+EOM
+}
+]
diff --git a/www/mod_security/Makefile b/www/mod_security/Makefile
index ea86f923ce89..59322ab6aa4e 100644
--- a/www/mod_security/Makefile
+++ b/www/mod_security/Makefile
@@ -10,6 +10,8 @@ WWW= https://www.modsecurity.org/
LICENSE= APACHE20
+PORTSCOUT= limit:^2\.
+
LIB_DEPENDS+= libpcre2-8.so:devel/pcre2 \
libapr-1.so:devel/apr1 \
libyajl.so:devel/yajl \
diff --git a/www/moodle45/Makefile b/www/moodle45/Makefile
index 7294341508b8..2a972a6ae328 100644
--- a/www/moodle45/Makefile
+++ b/www/moodle45/Makefile
@@ -1,5 +1,6 @@
PORTNAME= moodle
PORTVERSION= 4.5.8 # 4.5 is LTS version
+PORTREVISION= 4
CATEGORIES= www education
MASTER_SITES= https://packaging.moodle.org/stable405/ \
LOCAL/wen
diff --git a/www/moodle50/Makefile b/www/moodle50/Makefile
index c0782e8d7aa0..c3b404211dde 100644
--- a/www/moodle50/Makefile
+++ b/www/moodle50/Makefile
@@ -1,5 +1,6 @@
PORTNAME= moodle
PORTVERSION= 5.0.4
+PORTREVISION= 4
CATEGORIES= www education
MASTER_SITES= https://packaging.moodle.org/stable500/ \
LOCAL/wen
diff --git a/www/moodle51/Makefile b/www/moodle51/Makefile
index f7506dc27276..02cd0cc297a0 100644
--- a/www/moodle51/Makefile
+++ b/www/moodle51/Makefile
@@ -1,5 +1,6 @@
PORTNAME= moodle
PORTVERSION= 5.1.1
+PORTREVISION= 4
CATEGORIES= www education
MASTER_SITES= https://packaging.moodle.org/stable501/ \
LOCAL/wen
diff --git a/www/mybb/Makefile b/www/mybb/Makefile
index 46f45008c6ee..d35b8846ca4f 100644
--- a/www/mybb/Makefile
+++ b/www/mybb/Makefile
@@ -1,15 +1,15 @@
PORTNAME= mybb
-DISTVERSION= 1.8.33
+DISTVERSION= 1.8.39
CATEGORIES= www
-MAINTAINER= joneum@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= PHP-based bulletin board / discussion forum system
WWW= https://mybboard.net/
LICENSE= GPLv3
USE_GITHUB= yes
-GH_TAGNAME= ${PORTNAME}_1832
+GH_TAGNAME= ${PORTNAME}_1839
USES= cpe mysql php:web
NO_BUILD= yes
diff --git a/www/mybb/distinfo b/www/mybb/distinfo
index cab9af38ec4e..e612dc3705a7 100644
--- a/www/mybb/distinfo
+++ b/www/mybb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1675840728
-SHA256 (mybb-mybb-1.8.33-mybb_1832_GH0.tar.gz) = 2c4ed18f94b7d0bea4d66e5fb066da645580d40838a54766604d762837749b39
-SIZE (mybb-mybb-1.8.33-mybb_1832_GH0.tar.gz) = 1928250
+TIMESTAMP = 1767834758
+SHA256 (mybb-mybb-1.8.39-mybb_1839_GH0.tar.gz) = 4b5aa7f052f4d75ccec39f30ba47b86699fe08a800bccf4211f17e8041ab1ef8
+SIZE (mybb-mybb-1.8.39-mybb_1839_GH0.tar.gz) = 1932641
diff --git a/www/mybb/pkg-plist b/www/mybb/pkg-plist
index fd9a9e5a99ba..7ee3f7c32af4 100644
--- a/www/mybb/pkg-plist
+++ b/www/mybb/pkg-plist
@@ -664,7 +664,12 @@
%%WWWDIR%%/install/resources/upgrade53.php
%%WWWDIR%%/install/resources/upgrade54.php
%%WWWDIR%%/install/resources/upgrade55.php
+%%WWWDIR%%/install/resources/upgrade56.php
+%%WWWDIR%%/install/resources/upgrade57.php
+%%WWWDIR%%/install/resources/upgrade58.php
+%%WWWDIR%%/install/resources/upgrade59.php
%%WWWDIR%%/install/resources/upgrade6.php
+%%WWWDIR%%/install/resources/upgrade60.php
%%WWWDIR%%/install/resources/upgrade7.php
%%WWWDIR%%/install/resources/upgrade8.php
%%WWWDIR%%/install/resources/upgrade9.php
diff --git a/www/nextcloud-appointments/Makefile b/www/nextcloud-appointments/Makefile
index 8c2c361a2f83..b9cf7fc73fed 100644
--- a/www/nextcloud-appointments/Makefile
+++ b/www/nextcloud-appointments/Makefile
@@ -1,5 +1,6 @@
PORTNAME= appointments
PORTVERSION= 2.6.2
+PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/raw/${DISTVERSIONPREFIX}${DISTVERSION}/build/artifacts/appstore/
DISTVERSIONPREFIX= v
diff --git a/www/nextcloud-calendar/Makefile b/www/nextcloud-calendar/Makefile
index 13c8b47ccc1b..a07ddae38b56 100644
--- a/www/nextcloud-calendar/Makefile
+++ b/www/nextcloud-calendar/Makefile
@@ -1,5 +1,5 @@
PORTNAME= calendar
-PORTVERSION= 6.1.3
+PORTVERSION= 6.1.4
DISTVERSIONPREFIX= v
CATEGORIES= www
diff --git a/www/nextcloud-calendar/distinfo b/www/nextcloud-calendar/distinfo
index a250eb85d9d8..b7131a5f10d0 100644
--- a/www/nextcloud-calendar/distinfo
+++ b/www/nextcloud-calendar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1767091543
-SHA256 (nextcloud/calendar-v6.1.3.tar.gz) = 2b1b3f3d1285b77d0233253435e3b11f2eac026f2f441278c572eeba946ba601
-SIZE (nextcloud/calendar-v6.1.3.tar.gz) = 19880769
+TIMESTAMP = 1767854639
+SHA256 (nextcloud/calendar-v6.1.4.tar.gz) = 768fdcf9c406b589e19231624f0eef3d1babeb4e418396c25c7d88b3d14f54ba
+SIZE (nextcloud/calendar-v6.1.4.tar.gz) = 19880334
diff --git a/www/nextcloud-contacts/Makefile b/www/nextcloud-contacts/Makefile
index 90b751f79671..5523b8614e6e 100644
--- a/www/nextcloud-contacts/Makefile
+++ b/www/nextcloud-contacts/Makefile
@@ -1,5 +1,5 @@
PORTNAME= contacts
-PORTVERSION= 8.1.2
+PORTVERSION= 8.2.0
DISTVERSIONPREFIX= v
CATEGORIES= www
diff --git a/www/nextcloud-contacts/distinfo b/www/nextcloud-contacts/distinfo
index 5eb7282cd6c5..f9c9a934ad24 100644
--- a/www/nextcloud-contacts/distinfo
+++ b/www/nextcloud-contacts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1766128426
-SHA256 (nextcloud/contacts-v8.1.2.tar.gz) = 8bbd2d10d6bcb90c67603d8bb144444f62ceac436d814b242ee898f663be7c60
-SIZE (nextcloud/contacts-v8.1.2.tar.gz) = 4832846
+TIMESTAMP = 1767855796
+SHA256 (nextcloud/contacts-v8.2.0.tar.gz) = 610aa71237eedd2b7ee24acbbde90af6289672c55e822f4c1b9f7430ef50d090
+SIZE (nextcloud/contacts-v8.2.0.tar.gz) = 4839729
diff --git a/www/nextcloud-deck/Makefile b/www/nextcloud-deck/Makefile
index 5b45e8efc5cf..c17315206d59 100644
--- a/www/nextcloud-deck/Makefile
+++ b/www/nextcloud-deck/Makefile
@@ -1,5 +1,5 @@
PORTNAME= deck
-DISTVERSION= 1.16.2
+DISTVERSION= 1.16.3
DISTVERSIONPREFIX= v
CATEGORIES= www
diff --git a/www/nextcloud-deck/distinfo b/www/nextcloud-deck/distinfo
index cd3168b1072b..06e5e8912b38 100644
--- a/www/nextcloud-deck/distinfo
+++ b/www/nextcloud-deck/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1763808214
-SHA256 (nextcloud/deck-v1.16.2.tar.gz) = f56e51f1171924ab94981f7dbab44d5349971c1120f32db7f58ce6b2af699484
-SIZE (nextcloud/deck-v1.16.2.tar.gz) = 14306360
+TIMESTAMP = 1767856949
+SHA256 (nextcloud/deck-v1.16.3.tar.gz) = 46a637a272d8630d373115af66fc1d3bd42495e5c1f13cf5aba3a7906a93b2e6
+SIZE (nextcloud/deck-v1.16.3.tar.gz) = 14598047
diff --git a/www/nextcloud-forms/Makefile b/www/nextcloud-forms/Makefile
index 4d17a1a0b85f..048b7428bc03 100644
--- a/www/nextcloud-forms/Makefile
+++ b/www/nextcloud-forms/Makefile
@@ -1,6 +1,7 @@
PORTNAME= forms
PORTVERSION= 5.2.3
DISTVERSIONPREFIX= v
+PORTREVISION= 4
CATEGORIES= www
MAINTAINER= brnrd@FreeBSD.org
diff --git a/www/nextcloud-groupfolders/Makefile b/www/nextcloud-groupfolders/Makefile
index 2108e1059d36..30dd0b0ebbce 100644
--- a/www/nextcloud-groupfolders/Makefile
+++ b/www/nextcloud-groupfolders/Makefile
@@ -1,6 +1,7 @@
PORTNAME= groupfolders
PORTVERSION= 20.1.6
DISTVERSIONPREFIX= v
+PORTREVISION= 4
CATEGORIES= www
MAINTAINER= brnrd@FreeBSD.org
diff --git a/www/nextcloud-news/Makefile b/www/nextcloud-news/Makefile
index 3dc224ba7391..13c445c6caa2 100644
--- a/www/nextcloud-news/Makefile
+++ b/www/nextcloud-news/Makefile
@@ -1,5 +1,6 @@
PORTNAME= news
PORTVERSION= 27.2.0
+PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
DISTNAME= ${PORTNAME}
diff --git a/www/nextcloud-notes/Makefile b/www/nextcloud-notes/Makefile
index 4cc67779cae3..e3f5d2b96909 100644
--- a/www/nextcloud-notes/Makefile
+++ b/www/nextcloud-notes/Makefile
@@ -1,6 +1,7 @@
PORTNAME= notes
PORTVERSION= 4.12.4
DISTVERSIONPREFIX= v
+PORTREVISION= 4
CATEGORIES= www editors
MAINTAINER= brnrd@FreeBSD.org
diff --git a/www/nextcloud-tasks/Makefile b/www/nextcloud-tasks/Makefile
index b3aac8f7a9c7..456162c61ada 100644
--- a/www/nextcloud-tasks/Makefile
+++ b/www/nextcloud-tasks/Makefile
@@ -1,6 +1,7 @@
PORTNAME= tasks
PORTVERSION= 0.17.1
DISTVERSIONPREFIX= v
+PORTREVISION= 4
CATEGORIES= www
MASTER_SITES?= https://github.com/nextcloud/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/
DISTNAME= ${PORTNAME}
diff --git a/www/nextcloud/Makefile b/www/nextcloud/Makefile
index 18e7089d5fba..7888d2657a4a 100644
--- a/www/nextcloud/Makefile
+++ b/www/nextcloud/Makefile
@@ -1,5 +1,6 @@
PORTNAME= nextcloud
PORTVERSION= 32.0.3
+PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= https://github.com/nextcloud-releases/server/releases/download/v${PORTVERSION} \
https://download.nextcloud.com/server/releases/
diff --git a/www/nginx-acme/Makefile b/www/nginx-acme/Makefile
index 61f8fb4a446d..c48493a86ee8 100644
--- a/www/nginx-acme/Makefile
+++ b/www/nginx-acme/Makefile
@@ -4,9 +4,9 @@ PORTREVISION= 6
CATEGORIES= www
MASTER_SITES= https://github.com/nginx/nginx-${PORTNAME}/releases/download/v${PORTVERSION}/:acme \
https://nginx.org/download/:nginx
-PKGNAMEPREFIX= nginx-devel-
DISTFILES= nginx-${PORTNAME}-${DISTVERSION}.tar.gz:acme \
- nginx-${NGINX_VERSION}.tar.gz
+ nginx-${NGINX_VERSION_DEFAULT}.tar.gz:nginx \
+ nginx-${NGINX_VERSION_DEVEL}.tar.gz:nginx
MAINTAINER= joneum@FreeBSD.org
COMMENT= ACME module for NGINX
@@ -17,24 +17,40 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS+= libpcre2-8.so:devel/pcre2
-#FLAVORS= default devel
-#FLAVOR?= ${FLAVORS:[2]}
-#default_PKGNAMEPREFIX= nginx-
-#devel_PKGNAMEPREFIX= nginx-devel-
-#default_CONFLICTS_INSTALL= nginx-devel-${PORTNAME}
-#devel_CONFLICTS_INSTALL= nginx-${PORTNAME}
+FLAVORS= default devel
+FLAVOR?= default
+
+USES= cargo cpe llvm:lib,noexport ssl
+
+default_PKGNAMEPREFIX= nginx-
+devel_PKGNAMEPREFIX= nginx-devel-
+PKGNAMEPREFIX= ${${FLAVOR}_PKGNAMEPREFIX}
WRKSRC= ${WRKDIR}/nginx-${PORTNAME}-${PORTVERSION}
-#.if ${FLAVOR} == devel
+default_CONFLICTS_INSTALL= nginx-devel-${PORTNAME}
+devel_CONFLICTS_INSTALL= nginx-${PORTNAME}
+CONFLICTS_INSTALL= ${${FLAVOR}_CONFLICTS_INSTALL}
+
+.include "${.CURDIR}/../nginx/version.mk"
+NGINX_VERSION_DEFAULT:= ${NGINX_VERSION}
+
+.undef NGINX_VERSION
.include "${.CURDIR}/../nginx-devel/version.mk"
+NGINX_VERSION_DEVEL:= ${NGINX_VERSION}
+
+.if ${FLAVOR} == devel
RUN_DEPENDS= ${LOCALBASE}/sbin/nginx:www/nginx-devel
-#.else
-#.include "${.CURDIR}/../nginx/version.mk"
-#RUN_DEPENDS= ${LOCALBASE}/sbin/nginx:www/nginx
-#.endif
+.else
+RUN_DEPENDS= ${LOCALBASE}/sbin/nginx:www/nginx
+.endif
-USES= cargo cpe llvm:lib,noexport ssl
+.if ${FLAVOR} == devel
+NGINX_VERSION= ${NGINX_VERSION_DEVEL}
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_conf_order.rs-devel
+.else
+NGINX_VERSION= ${NGINX_VERSION_DEFAULT}
+.endif
CPE_VENDOR= f5
CPE_PRODUCT= nginx-acme
diff --git a/www/nginx-acme/distinfo b/www/nginx-acme/distinfo
index 94cab12d07ef..e4334f0beff1 100644
--- a/www/nginx-acme/distinfo
+++ b/www/nginx-acme/distinfo
@@ -1,10 +1,10 @@
-TIMESTAMP = 1762538753
+TIMESTAMP = 1767629215
SHA256 (nginx-acme-0.1.1.tar.gz) = c2158d7f9baa53a9186c406e82c3068832f03b87a1d1066b0d214a8bf834ddfd
SIZE (nginx-acme-0.1.1.tar.gz) = 77853
SHA256 (nginx-1.28.0.tar.gz) = c6b5c6b086c0df9d3ca3ff5e084c1d0ef909e6038279c71c1c3e985f576ff76a
SIZE (nginx-1.28.0.tar.gz) = 1280111
-SHA256 (nginx-1.29.3.tar.gz) = 9befcced12ee09c2f4e1385d7e8e21c91f1a5a63b196f78f897c2d044b8c9312
-SIZE (nginx-1.29.3.tar.gz) = 1289818
+SHA256 (nginx-1.29.4.tar.gz) = 5a7d37eee505866fbab5810fa9f78247d6d5d9157a595c4e7a72043141ddab25
+SIZE (nginx-1.29.4.tar.gz) = 1309500
SHA256 (rust/crates/addr2line-0.24.2.crate) = dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1
SIZE (rust/crates/addr2line-0.24.2.crate) = 39015
SHA256 (rust/crates/adler2-2.0.1.crate) = 320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa
diff --git a/www/nginx-acme/files/extra-patch-src_conf_order.rs-devel b/www/nginx-acme/files/extra-patch-src_conf_order.rs-devel
new file mode 100644
index 000000000000..9284fb470a46
--- /dev/null
+++ b/www/nginx-acme/files/extra-patch-src_conf_order.rs-devel
@@ -0,0 +1,11 @@
+--- src/conf/order.rs.orig 2026-01-06 14:12:56.622627000 +0100
++++ src/conf/order.rs 2026-01-06 14:14:51.810902000 +0100
+@@ -249,7 +249,7 @@ fn validate_host(pool: &Pool, mut host: ngx_str_t) ->
+
+ fn validate_host(pool: &Pool, mut host: ngx_str_t) -> Result<ngx_str_t, Status> {
+ let mut pool = pool.clone();
+- let rc = Status(unsafe { nginx_sys::ngx_http_validate_host(&mut host, pool.as_mut(), 1) });
++ let rc = Status(unsafe { nginx_sys::ngx_http_validate_host(&mut host, std::ptr::null_mut(), pool.as_mut(), 1) });
+ if rc != Status::NGX_OK {
+ return Err(rc);
+ }
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 52dc99ad6181..74b27d3e09ab 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1,7 +1,7 @@
PORTNAME?= nginx
PORTVERSION= ${NGINX_VERSION}
.include "version.mk"
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
LOCAL/osa
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index 099e442e7554..96408278ce32 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -205,7 +205,7 @@ LUA_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty
LUA_RUN_DEPENDS= lua-resty-core>0:www/lua-resty-core
LUA_CONFIGURE_ENV= LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \
LUAJIT_LIB=${LOCALBASE}/lib
-LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.28:lua
+LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.29:lua
LUA_VARS= DSO_EXTMODS+=lua
LUASTREAM_IMPLIES= DEVEL_KIT
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 73cb93d2aad3..424c886c2392 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1766140590
+TIMESTAMP = 1767699196
SHA256 (nginx-1.29.4.tar.gz) = 5a7d37eee505866fbab5810fa9f78247d6d5d9157a595c4e7a72043141ddab25
SIZE (nginx-1.29.4.tar.gz) = 1309500
SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -93,8 +93,8 @@ SHA256 (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 7393809d5d8877812da1bd5b5f
SIZE (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 20617
SHA256 (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 20c3679199ba7efe1598f03b2fa0b13591226363c8dd7930d7f02702cd5abada
SIZE (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 139656
-SHA256 (openresty-lua-nginx-module-v0.10.28_GH0.tar.gz) = 634827d54de6216cb0502d14f76610788b3a3e33160e91d5578d6db0d9a34a20
-SIZE (openresty-lua-nginx-module-v0.10.28_GH0.tar.gz) = 869217
+SHA256 (openresty-lua-nginx-module-v0.10.29_GH0.tar.gz) = ca2c2122b909529bf9d1a89e9a5763835a2bd2629def8cb279c550f638f0a78f
+SIZE (openresty-lua-nginx-module-v0.10.29_GH0.tar.gz) = 892502
SHA256 (openresty-stream-lua-nginx-module-v0.0.16_GH0.tar.gz) = 3b1103cf5ee940ea94711eae1a7ccc1a161273ec9a08eb415f1d45ad385f967d
SIZE (openresty-stream-lua-nginx-module-v0.0.16_GH0.tar.gz) = 395259
SHA256 (openresty-memc-nginx-module-v0.20_GH0.tar.gz) = a42dd56dd6e2144755a127bcd2a6cc1a488258dc5cdb751d6a3e5dd5b6989239
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index f2adf79b094a..7a6484252ccf 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,7 +1,7 @@
PORTNAME= nginx
PORTVERSION= ${NGINX_VERSION}
.include "version.mk"
-PORTREVISION= 8
+PORTREVISION= 10
PORTEPOCH= 3
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
index eee8241b5fed..1c68cfdd85d6 100644
--- a/www/nginx/Makefile.extmod
+++ b/www/nginx/Makefile.extmod
@@ -203,7 +203,7 @@ LUA_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty
LUA_RUN_DEPENDS= lua-resty-core>0:www/lua-resty-core
LUA_CONFIGURE_ENV= LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \
LUAJIT_LIB=${LOCALBASE}/lib
-LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.28:lua
+LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.29:lua
LUA_VARS= DSO_EXTMODS+=lua
LUASTREAM_IMPLIES= DEVEL_KIT
@@ -242,7 +242,7 @@ NJS_XML_IMPLIES= HTTP NJS
NJS_XML_LIB_DEPENDS= libxml2.so:textproc/libxml2 \
libxslt.so:textproc/libxslt
-OTEL_GH_TUPLE= osokin:nginx-otel:8f0857d:otel
+OTEL_GH_TUPLE= osokin:nginx-otel:51273ec:otel
OTEL_VARS= DSO_EXTMODS+=otel OTEL_SUBDIR=/
OTEL_LIB_DEPENDS= libabsl_base.so:devel/abseil \
libcares.so:dns/c-ares \
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 19b87215caa6..ecf24cad3ea7 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1762716494
+TIMESTAMP = 1767729194
SHA256 (nginx-1.28.0.tar.gz) = c6b5c6b086c0df9d3ca3ff5e084c1d0ef909e6038279c71c1c3e985f576ff76a
SIZE (nginx-1.28.0.tar.gz) = 1280111
SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -91,8 +91,8 @@ SHA256 (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 7393809d5d8877812da1bd5b5f
SIZE (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 20617
SHA256 (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 20c3679199ba7efe1598f03b2fa0b13591226363c8dd7930d7f02702cd5abada
SIZE (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 139656
-SHA256 (openresty-lua-nginx-module-v0.10.28_GH0.tar.gz) = 634827d54de6216cb0502d14f76610788b3a3e33160e91d5578d6db0d9a34a20
-SIZE (openresty-lua-nginx-module-v0.10.28_GH0.tar.gz) = 869217
+SHA256 (openresty-lua-nginx-module-v0.10.29_GH0.tar.gz) = ca2c2122b909529bf9d1a89e9a5763835a2bd2629def8cb279c550f638f0a78f
+SIZE (openresty-lua-nginx-module-v0.10.29_GH0.tar.gz) = 892502
SHA256 (openresty-stream-lua-nginx-module-v0.0.16_GH0.tar.gz) = 3b1103cf5ee940ea94711eae1a7ccc1a161273ec9a08eb415f1d45ad385f967d
SIZE (openresty-stream-lua-nginx-module-v0.0.16_GH0.tar.gz) = 395259
SHA256 (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bfb09a2668f9281d7de6218c7b462a7ba2cee06fe8
@@ -105,8 +105,8 @@ SHA256 (libinjection-libinjection-4aa3894_GH0.tar.gz) = ededea133e89e238ef2e60d0
SIZE (libinjection-libinjection-4aa3894_GH0.tar.gz) = 2218294
SHA256 (nginx-njs-0.9.4_GH0.tar.gz) = 7b3a9f14b0f09311d9031c2a252cb0e23c06baac2e586a7d12c75aa6cba4ca0e
SIZE (nginx-njs-0.9.4_GH0.tar.gz) = 939082
-SHA256 (osokin-nginx-otel-8f0857d_GH0.tar.gz) = bbf93813928460bdaf78f752f74ecc6c34d13078e97fdffcaa29dbd8689314fc
-SIZE (osokin-nginx-otel-8f0857d_GH0.tar.gz) = 30197
+SHA256 (osokin-nginx-otel-51273ec_GH0.tar.gz) = a2107ba0be94c8561ae50773163c7946a58e508be46920f588d05a347c867d9c
+SIZE (osokin-nginx-otel-51273ec_GH0.tar.gz) = 28076
SHA256 (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = c69ad4495de7c7883ebc23e1e6c4cc83a4ac6a7fddd4d5c12e49d33b65f7c50b
SIZE (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = 48544
SHA256 (openresty-rds-csv-nginx-module-v0.09_GH0.tar.gz) = 896be99c0cad50218417800a159e43ec088d6b58c099472ed3b3d7f179d6c0ea
diff --git a/www/onionshare-cli/Makefile b/www/onionshare-cli/Makefile
index 142eb93b0fa9..8bb7679932e9 100644
--- a/www/onionshare-cli/Makefile
+++ b/www/onionshare-cli/Makefile
@@ -1,7 +1,7 @@
PORTNAME= onionshare-cli
PORTVERSION= 2.6
DISTNAME= onionshare_cli-${PORTVERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www security python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/piwigo/Makefile b/www/piwigo/Makefile
index b6c16bb4ebd6..78921e4ac484 100644
--- a/www/piwigo/Makefile
+++ b/www/piwigo/Makefile
@@ -1,6 +1,6 @@
PORTNAME= piwigo
DISTVERSION= 16.2.0
-PORTREVISION= 0
+PORTREVISION= 4
PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
CATEGORIES= www
MASTER_SITES= https://piwigo.org/download/dlcounter.php?code=${PORTVERSION}&/
diff --git a/www/pmwiki/Makefile b/www/pmwiki/Makefile
index 623bd68118c8..9b1a35f69499 100644
--- a/www/pmwiki/Makefile
+++ b/www/pmwiki/Makefile
@@ -1,10 +1,10 @@
PORTNAME= pmwiki
-PORTVERSION= 2.4.1
+PORTVERSION= 2.5.4
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= http://www.pmwiki.org/pub/pmwiki/
-MAINTAINER= joneum@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= WikiWikiWeb clone using PHP
WWW= https://www.pmwiki.org
diff --git a/www/pmwiki/distinfo b/www/pmwiki/distinfo
index f40935e54b2c..2bd8a0bc8f8a 100644
--- a/www/pmwiki/distinfo
+++ b/www/pmwiki/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738244793
-SHA256 (pmwiki-2.4.1.tgz) = 95547c86519a5e56b0499fbb1feaece60600701302b9954ab570e31fe7401b49
-SIZE (pmwiki-2.4.1.tgz) = 554060
+TIMESTAMP = 1767831513
+SHA256 (pmwiki-2.5.4.tgz) = ddd2963616c38edc0aab949e566e18d1b18ede96883b9eed4692a2441949cc42
+SIZE (pmwiki-2.5.4.tgz) = 571627
diff --git a/www/pmwiki/pkg-plist b/www/pmwiki/pkg-plist
index 130e9c9eea41..4152d298531a 100644
--- a/www/pmwiki/pkg-plist
+++ b/www/pmwiki/pkg-plist
@@ -1,233 +1,234 @@
@dir(%%WWWOWN%%,%%WWWGRP%%,775) %%PMWIKIDIR%%/wiki.d
@dir(%%WWWOWN%%,%%WWWGRP%%) %%PMWIKIDIR%%
@dir %%PMWIKIDIR%%/pub/css
-%%PMWIKIDIR%%/wikilib.d/SiteAdmin.Status
-%%PMWIKIDIR%%/wikilib.d/SiteAdmin.SiteAdmin
-%%PMWIKIDIR%%/wikilib.d/SiteAdmin.GroupAttributes
-%%PMWIKIDIR%%/wikilib.d/SiteAdmin.AuthUser
-%%PMWIKIDIR%%/wikilib.d/SiteAdmin.AuthList
-%%PMWIKIDIR%%/wikilib.d/Site.UploadQuickReference
-%%PMWIKIDIR%%/wikilib.d/Site.Site
-%%PMWIKIDIR%%/wikilib.d/Site.SideBar
-%%PMWIKIDIR%%/wikilib.d/Site.Search
-%%PMWIKIDIR%%/wikilib.d/Site.Preferences
-%%PMWIKIDIR%%/wikilib.d/Site.PmFormTemplates
-%%PMWIKIDIR%%/wikilib.d/Site.PageNotFound
-%%PMWIKIDIR%%/wikilib.d/Site.PageListTemplates
-%%PMWIKIDIR%%/wikilib.d/Site.PageActions
-%%PMWIKIDIR%%/wikilib.d/Site.GroupAttributes
-%%PMWIKIDIR%%/wikilib.d/Site.EditQuickReference
-%%PMWIKIDIR%%/wikilib.d/Site.EditForm
-%%PMWIKIDIR%%/wikilib.d/Site.AuthUser
-%%PMWIKIDIR%%/wikilib.d/Site.AuthForm
-%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiWords
-%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiWord
-%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiWikiWeb
-%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiTrails
-%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiStyles
-%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiStyleExamples
-%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiStructure
-%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiSandbox
-%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiPage
-%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiGroups
-%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiGroup
-%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiFarms
-%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiFarmTerminology
-%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiAdministrator
-%%PMWIKIDIR%%/wikilib.d/PmWiki.WebFeeds
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Version
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Variables
-%%PMWIKIDIR%%/wikilib.d/PmWiki.UrlApprovals
-%%PMWIKIDIR%%/wikilib.d/PmWiki.UploadsAdmin
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Uploads
-%%PMWIKIDIR%%/wikilib.d/PmWiki.UploadVariables
-%%PMWIKIDIR%%/wikilib.d/PmWiki.UpgradingFromPmWiki1
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Upgrades
-%%PMWIKIDIR%%/wikilib.d/PmWiki.UTF-8
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Troubleshooting
-%%PMWIKIDIR%%/wikilib.d/PmWiki.TextFormattingRules
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Tables
-%%PMWIKIDIR%%/wikilib.d/PmWiki.TableOfContents
-%%PMWIKIDIR%%/wikilib.d/PmWiki.TableDirectives
-%%PMWIKIDIR%%/wikilib.d/PmWiki.SpecialCharacters
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Skins
-%%PMWIKIDIR%%/wikilib.d/PmWiki.SkinTemplates
-%%PMWIKIDIR%%/wikilib.d/PmWiki.SitePreferences
-%%PMWIKIDIR%%/wikilib.d/PmWiki.SitePageActions
-%%PMWIKIDIR%%/wikilib.d/PmWiki.SimultaneousEdits
-%%PMWIKIDIR%%/wikilib.d/PmWiki.SecurityVariables
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Security
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Search
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Requirements
-%%PMWIKIDIR%%/wikilib.d/PmWiki.ReleaseNotes
-%%PMWIKIDIR%%/wikilib.d/PmWiki.RefCount
-%%PMWIKIDIR%%/wikilib.d/PmWiki.PmWikiPhilosophy
-%%PMWIKIDIR%%/wikilib.d/PmWiki.PmWiki
-%%PMWIKIDIR%%/wikilib.d/PmWiki.PatrickMichaud
-%%PMWIKIDIR%%/wikilib.d/PmWiki.PathVariables
-%%PMWIKIDIR%%/wikilib.d/PmWiki.PasswordsAdmin
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Passwords
-%%PMWIKIDIR%%/wikilib.d/PmWiki.PagelistVariables
-%%PMWIKIDIR%%/wikilib.d/PmWiki.PageVariables
-%%PMWIKIDIR%%/wikilib.d/PmWiki.PageTextVariables
-%%PMWIKIDIR%%/wikilib.d/PmWiki.PageLists
-%%PMWIKIDIR%%/wikilib.d/PmWiki.PageListTemplates
-%%PMWIKIDIR%%/wikilib.d/PmWiki.PageHistory
-%%PMWIKIDIR%%/wikilib.d/PmWiki.PageFileFormat
-%%PMWIKIDIR%%/wikilib.d/PmWiki.PageDirectives
-%%PMWIKIDIR%%/wikilib.d/PmWiki.OtherVariables
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Notify
-%%PMWIKIDIR%%/wikilib.d/PmWiki.MarkupMasterIndex
-%%PMWIKIDIR%%/wikilib.d/PmWiki.MarkupExpressions
-%%PMWIKIDIR%%/wikilib.d/PmWiki.MailingLists
-%%PMWIKIDIR%%/wikilib.d/PmWiki.LocalCustomizations
-%%PMWIKIDIR%%/wikilib.d/PmWiki.ListStyles
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Links
-%%PMWIKIDIR%%/wikilib.d/PmWiki.LinkVariables
-%%PMWIKIDIR%%/wikilib.d/PmWiki.LayoutVariables
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Introduction
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Internationalizations
-%%PMWIKIDIR%%/wikilib.d/PmWiki.InterMap
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Installation
-%%PMWIKIDIR%%/wikilib.d/PmWiki.InitialSetupTasks
-%%PMWIKIDIR%%/wikilib.d/PmWiki.IncludeOtherPages
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Images
-%%PMWIKIDIR%%/wikilib.d/PmWiki.I18nVariables
-%%PMWIKIDIR%%/wikilib.d/PmWiki.GroupHeaders
-%%PMWIKIDIR%%/wikilib.d/PmWiki.GroupHeader
-%%PMWIKIDIR%%/wikilib.d/PmWiki.GroupFooter
-%%PMWIKIDIR%%/wikilib.d/PmWiki.GroupCustomizations
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Glossary
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Functions
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Forms
-%%PMWIKIDIR%%/wikilib.d/PmWiki.FmtPageName
-%%PMWIKIDIR%%/wikilib.d/PmWiki.FilePermissions
-%%PMWIKIDIR%%/wikilib.d/PmWiki.FAQ
-%%PMWIKIDIR%%/wikilib.d/PmWiki.EditVariables
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Drafts
-%%PMWIKIDIR%%/wikilib.d/PmWiki.DocumentationIndex
-%%PMWIKIDIR%%/wikilib.d/PmWiki.DesignNotes
-%%PMWIKIDIR%%/wikilib.d/PmWiki.DeletingPages
-%%PMWIKIDIR%%/wikilib.d/PmWiki.DebugVariables
-%%PMWIKIDIR%%/wikilib.d/PmWiki.CustomWikiStyles
-%%PMWIKIDIR%%/wikilib.d/PmWiki.CustomMarkup
-%%PMWIKIDIR%%/wikilib.d/PmWiki.CustomInterMap
-%%PMWIKIDIR%%/wikilib.d/PmWiki.CreatingNewPages
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Contributors
-%%PMWIKIDIR%%/wikilib.d/PmWiki.ContactUs
-%%PMWIKIDIR%%/wikilib.d/PmWiki.ConditionalMarkup
-%%PMWIKIDIR%%/wikilib.d/PmWiki.ChangeLog
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Categories
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Blocklist
-%%PMWIKIDIR%%/wikilib.d/PmWiki.BlockMarkup
-%%PMWIKIDIR%%/wikilib.d/PmWiki.BasicVariables
-%%PMWIKIDIR%%/wikilib.d/PmWiki.BasicEditing
-%%PMWIKIDIR%%/wikilib.d/PmWiki.BackupAndRestore
-%%PMWIKIDIR%%/wikilib.d/PmWiki.AvailableActions
-%%PMWIKIDIR%%/wikilib.d/PmWiki.AuthUser
-%%PMWIKIDIR%%/wikilib.d/PmWiki.Audiences
-%%PMWIKIDIR%%/wikilib.d/PmWiki.AccessKeys
-%%PMWIKIDIR%%/wikilib.d/Main.WikiSandbox
-%%PMWIKIDIR%%/wikilib.d/Main.HomePage
-%%PMWIKIDIR%%/wikilib.d/Category.GroupFooter
-%%PMWIKIDIR%%/scripts/xlpage-utf-8.php
-%%PMWIKIDIR%%/scripts/xlpage-iso-8859-9.php
-%%PMWIKIDIR%%/scripts/xlpage-iso-8859-2.php
-%%PMWIKIDIR%%/scripts/xlpage-iso-8859-13.php
-%%PMWIKIDIR%%/scripts/wikiwords.php
-%%PMWIKIDIR%%/scripts/wikistyles.php
-%%PMWIKIDIR%%/scripts/version.php
-%%PMWIKIDIR%%/scripts/vardoc.php
-%%PMWIKIDIR%%/scripts/utils.php
-%%PMWIKIDIR%%/scripts/urlapprove.php
-%%PMWIKIDIR%%/scripts/upload.php
-%%PMWIKIDIR%%/scripts/upgrades.php
-%%PMWIKIDIR%%/scripts/transition.php
-%%PMWIKIDIR%%/scripts/trails.php
-%%PMWIKIDIR%%/scripts/stdmarkup.php
-%%PMWIKIDIR%%/scripts/stdconfig.php
-%%PMWIKIDIR%%/scripts/skins.php
-%%PMWIKIDIR%%/scripts/simuledit.php
-%%PMWIKIDIR%%/scripts/robots.php
-%%PMWIKIDIR%%/scripts/refcount.php
-%%PMWIKIDIR%%/scripts/prefs.php
-%%PMWIKIDIR%%/scripts/pmform.php
-%%PMWIKIDIR%%/scripts/phpdiff.php
-%%PMWIKIDIR%%/scripts/pgcust.php
-%%PMWIKIDIR%%/scripts/pagerev.php
-%%PMWIKIDIR%%/scripts/pagelist.php
-%%PMWIKIDIR%%/scripts/notify.php
-%%PMWIKIDIR%%/scripts/markupexpr.php
-%%PMWIKIDIR%%/scripts/intermap.txt
-%%PMWIKIDIR%%/scripts/httpauth.php
-%%PMWIKIDIR%%/scripts/guiedit.php
-%%PMWIKIDIR%%/scripts/forms.php
-%%PMWIKIDIR%%/scripts/feeds.php
-%%PMWIKIDIR%%/scripts/draft.php
-%%PMWIKIDIR%%/scripts/diag.php
-%%PMWIKIDIR%%/scripts/crypt.php
-%%PMWIKIDIR%%/scripts/creole.php
-%%PMWIKIDIR%%/scripts/caches.php
-%%PMWIKIDIR%%/scripts/blocklist.php
-%%PMWIKIDIR%%/scripts/authuser.php
-%%PMWIKIDIR%%/scripts/author.php
-%%PMWIKIDIR%%/scripts/.htaccess
-%%PMWIKIDIR%%/sample-config.php
-%%PMWIKIDIR%%/pub/skins/print/print.tmpl
-%%PMWIKIDIR%%/pub/skins/print/print.php
-%%PMWIKIDIR%%/pub/skins/print/print.css
-%%PMWIKIDIR%%/pub/skins/print/README
-%%PMWIKIDIR%%/pub/skins/pmwiki/pmwiki.tmpl
-%%PMWIKIDIR%%/pub/skins/pmwiki/pmwiki.css
-%%PMWIKIDIR%%/pub/skins/pmwiki/pmwiki-32.gif
-%%PMWIKIDIR%%/pub/skins/pmwiki/pmwiki-32.svg
-%%PMWIKIDIR%%/pub/skins/pmwiki/README
-%%PMWIKIDIR%%/pub/skins/pmwiki-responsive/xwrench.svg
-%%PMWIKIDIR%%/pub/skins/pmwiki-responsive/xsearch.svg
-%%PMWIKIDIR%%/pub/skins/pmwiki-responsive/xmenu.svg
-%%PMWIKIDIR%%/pub/skins/pmwiki-responsive/xclose.svg
-%%PMWIKIDIR%%/pub/skins/pmwiki-responsive/skin.tmpl
-%%PMWIKIDIR%%/pub/skins/pmwiki-responsive/skin.php
-%%PMWIKIDIR%%/pub/skins/pmwiki-responsive/skin.js
-%%PMWIKIDIR%%/pub/skins/pmwiki-responsive/skin.css
-%%PMWIKIDIR%%/pub/skins/pmwiki-responsive/README
-%%PMWIKIDIR%%/pub/guiedit/underline.gif
-%%PMWIKIDIR%%/pub/guiedit/ul.gif
-%%PMWIKIDIR%%/pub/guiedit/table.gif
-%%PMWIKIDIR%%/pub/guiedit/sup.gif
-%%PMWIKIDIR%%/pub/guiedit/sub.gif
-%%PMWIKIDIR%%/pub/guiedit/strong.gif
-%%PMWIKIDIR%%/pub/guiedit/spellcheck.gif
-%%PMWIKIDIR%%/pub/guiedit/small.gif
-%%PMWIKIDIR%%/pub/guiedit/save.gif
-%%PMWIKIDIR%%/pub/guiedit/right.gif
-%%PMWIKIDIR%%/pub/guiedit/preview.gif
-%%PMWIKIDIR%%/pub/guiedit/pagelink.gif
-%%PMWIKIDIR%%/pub/guiedit/outdent.gif
-%%PMWIKIDIR%%/pub/guiedit/ol.gif
-%%PMWIKIDIR%%/pub/guiedit/math.gif
-%%PMWIKIDIR%%/pub/guiedit/left.gif
-%%PMWIKIDIR%%/pub/guiedit/indent.gif
-%%PMWIKIDIR%%/pub/guiedit/hr.gif
-%%PMWIKIDIR%%/pub/guiedit/h3.gif
-%%PMWIKIDIR%%/pub/guiedit/h2.gif
-%%PMWIKIDIR%%/pub/guiedit/h1.gif
-%%PMWIKIDIR%%/pub/guiedit/h.gif
-%%PMWIKIDIR%%/pub/guiedit/guiedit.js
-%%PMWIKIDIR%%/pub/guiedit/fixurl.png
-%%PMWIKIDIR%%/pub/guiedit/extlink.gif
-%%PMWIKIDIR%%/pub/guiedit/em.gif
-%%PMWIKIDIR%%/pub/guiedit/center.gif
-%%PMWIKIDIR%%/pub/guiedit/blank.gif
-%%PMWIKIDIR%%/pub/guiedit/big.gif
-%%PMWIKIDIR%%/pub/guiedit/attach.gif
+%%PMWIKIDIR%%/cookbook/.htaccess
+%%PMWIKIDIR%%/local/.htaccess
+%%PMWIKIDIR%%/pmwiki.php
%%PMWIKIDIR%%/pub/guiedit/README
+%%PMWIKIDIR%%/pub/guiedit/attach.gif
+%%PMWIKIDIR%%/pub/guiedit/big.gif
+%%PMWIKIDIR%%/pub/guiedit/blank.gif
+%%PMWIKIDIR%%/pub/guiedit/center.gif
+%%PMWIKIDIR%%/pub/guiedit/em.gif
+%%PMWIKIDIR%%/pub/guiedit/extlink.gif
+%%PMWIKIDIR%%/pub/guiedit/fixurl.png
+%%PMWIKIDIR%%/pub/guiedit/guiedit.js
+%%PMWIKIDIR%%/pub/guiedit/h.gif
+%%PMWIKIDIR%%/pub/guiedit/h1.gif
+%%PMWIKIDIR%%/pub/guiedit/h2.gif
+%%PMWIKIDIR%%/pub/guiedit/h3.gif
+%%PMWIKIDIR%%/pub/guiedit/hr.gif
+%%PMWIKIDIR%%/pub/guiedit/indent.gif
+%%PMWIKIDIR%%/pub/guiedit/left.gif
+%%PMWIKIDIR%%/pub/guiedit/math.gif
+%%PMWIKIDIR%%/pub/guiedit/ol.gif
+%%PMWIKIDIR%%/pub/guiedit/outdent.gif
+%%PMWIKIDIR%%/pub/guiedit/pagelink.gif
+%%PMWIKIDIR%%/pub/guiedit/preview.gif
+%%PMWIKIDIR%%/pub/guiedit/right.gif
+%%PMWIKIDIR%%/pub/guiedit/save.gif
+%%PMWIKIDIR%%/pub/guiedit/small.gif
+%%PMWIKIDIR%%/pub/guiedit/spellcheck.gif
+%%PMWIKIDIR%%/pub/guiedit/strong.gif
+%%PMWIKIDIR%%/pub/guiedit/sub.gif
+%%PMWIKIDIR%%/pub/guiedit/sup.gif
+%%PMWIKIDIR%%/pub/guiedit/table.gif
+%%PMWIKIDIR%%/pub/guiedit/ul.gif
+%%PMWIKIDIR%%/pub/guiedit/underline.gif
%%PMWIKIDIR%%/pub/lib/pmwiki-core.css
%%PMWIKIDIR%%/pub/lib/pmwiki-darktoggle.js
%%PMWIKIDIR%%/pub/lib/pmwiki-lib.js
%%PMWIKIDIR%%/pub/lib/pmwiki-utils.js
%%PMWIKIDIR%%/pub/lib/pmwiki.syntax.css
%%PMWIKIDIR%%/pub/lib/pmwiki.syntax.js
-%%PMWIKIDIR%%/pmwiki.php
-%%PMWIKIDIR%%/local/.htaccess
-%%PMWIKIDIR%%/cookbook/.htaccess
+%%PMWIKIDIR%%/pub/skins/pmwiki-responsive/README
+%%PMWIKIDIR%%/pub/skins/pmwiki-responsive/skin.css
+%%PMWIKIDIR%%/pub/skins/pmwiki-responsive/skin.js
+%%PMWIKIDIR%%/pub/skins/pmwiki-responsive/skin.php
+%%PMWIKIDIR%%/pub/skins/pmwiki-responsive/skin.tmpl
+%%PMWIKIDIR%%/pub/skins/pmwiki-responsive/xclose.svg
+%%PMWIKIDIR%%/pub/skins/pmwiki-responsive/xmenu.svg
+%%PMWIKIDIR%%/pub/skins/pmwiki-responsive/xsearch.svg
+%%PMWIKIDIR%%/pub/skins/pmwiki-responsive/xwrench.svg
+%%PMWIKIDIR%%/pub/skins/pmwiki/README
+%%PMWIKIDIR%%/pub/skins/pmwiki/pmwiki-32.gif
+%%PMWIKIDIR%%/pub/skins/pmwiki/pmwiki-32.svg
+%%PMWIKIDIR%%/pub/skins/pmwiki/pmwiki.css
+%%PMWIKIDIR%%/pub/skins/pmwiki/pmwiki.tmpl
+%%PMWIKIDIR%%/pub/skins/print/README
+%%PMWIKIDIR%%/pub/skins/print/print.css
+%%PMWIKIDIR%%/pub/skins/print/print.php
+%%PMWIKIDIR%%/pub/skins/print/print.tmpl
+%%PMWIKIDIR%%/sample-config.php
+%%PMWIKIDIR%%/scripts/.htaccess
+%%PMWIKIDIR%%/scripts/author.php
+%%PMWIKIDIR%%/scripts/authuser.php
+%%PMWIKIDIR%%/scripts/blocklist.php
+%%PMWIKIDIR%%/scripts/caches.php
+%%PMWIKIDIR%%/scripts/creole.php
+%%PMWIKIDIR%%/scripts/crypt.php
+%%PMWIKIDIR%%/scripts/diag.php
+%%PMWIKIDIR%%/scripts/draft.php
+%%PMWIKIDIR%%/scripts/feeds.php
+%%PMWIKIDIR%%/scripts/forms.php
+%%PMWIKIDIR%%/scripts/guiedit.php
+%%PMWIKIDIR%%/scripts/httpauth.php
+%%PMWIKIDIR%%/scripts/intermap.txt
+%%PMWIKIDIR%%/scripts/markupexpr.php
+%%PMWIKIDIR%%/scripts/notify.php
+%%PMWIKIDIR%%/scripts/pagelist.php
+%%PMWIKIDIR%%/scripts/pagerev.php
+%%PMWIKIDIR%%/scripts/pgcust.php
+%%PMWIKIDIR%%/scripts/phpdiff.php
+%%PMWIKIDIR%%/scripts/pmform.php
+%%PMWIKIDIR%%/scripts/prefs.php
+%%PMWIKIDIR%%/scripts/refcount.php
+%%PMWIKIDIR%%/scripts/robots.php
+%%PMWIKIDIR%%/scripts/simuledit.php
+%%PMWIKIDIR%%/scripts/skins.php
+%%PMWIKIDIR%%/scripts/stdconfig.php
+%%PMWIKIDIR%%/scripts/stdmarkup.php
+%%PMWIKIDIR%%/scripts/tools.php
+%%PMWIKIDIR%%/scripts/trails.php
+%%PMWIKIDIR%%/scripts/transition.php
+%%PMWIKIDIR%%/scripts/upgrades.php
+%%PMWIKIDIR%%/scripts/upload.php
+%%PMWIKIDIR%%/scripts/urlapprove.php
+%%PMWIKIDIR%%/scripts/utils.php
+%%PMWIKIDIR%%/scripts/vardoc.php
+%%PMWIKIDIR%%/scripts/version.php
+%%PMWIKIDIR%%/scripts/wikistyles.php
+%%PMWIKIDIR%%/scripts/wikiwords.php
+%%PMWIKIDIR%%/scripts/xlpage-iso-8859-13.php
+%%PMWIKIDIR%%/scripts/xlpage-iso-8859-2.php
+%%PMWIKIDIR%%/scripts/xlpage-iso-8859-9.php
+%%PMWIKIDIR%%/scripts/xlpage-utf-8.php
+%%PMWIKIDIR%%/wikilib.d/Category.GroupFooter
+%%PMWIKIDIR%%/wikilib.d/Main.HomePage
+%%PMWIKIDIR%%/wikilib.d/Main.WikiSandbox
+%%PMWIKIDIR%%/wikilib.d/PmWiki.AccessKeys
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Audiences
+%%PMWIKIDIR%%/wikilib.d/PmWiki.AuthUser
+%%PMWIKIDIR%%/wikilib.d/PmWiki.AvailableActions
+%%PMWIKIDIR%%/wikilib.d/PmWiki.BackupAndRestore
+%%PMWIKIDIR%%/wikilib.d/PmWiki.BasicEditing
+%%PMWIKIDIR%%/wikilib.d/PmWiki.BasicVariables
+%%PMWIKIDIR%%/wikilib.d/PmWiki.BlockMarkup
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Blocklist
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Categories
+%%PMWIKIDIR%%/wikilib.d/PmWiki.ChangeLog
+%%PMWIKIDIR%%/wikilib.d/PmWiki.ConditionalMarkup
+%%PMWIKIDIR%%/wikilib.d/PmWiki.ContactUs
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Contributors
+%%PMWIKIDIR%%/wikilib.d/PmWiki.CreatingNewPages
+%%PMWIKIDIR%%/wikilib.d/PmWiki.CustomInterMap
+%%PMWIKIDIR%%/wikilib.d/PmWiki.CustomMarkup
+%%PMWIKIDIR%%/wikilib.d/PmWiki.CustomWikiStyles
+%%PMWIKIDIR%%/wikilib.d/PmWiki.DebugVariables
+%%PMWIKIDIR%%/wikilib.d/PmWiki.DeletingPages
+%%PMWIKIDIR%%/wikilib.d/PmWiki.DesignNotes
+%%PMWIKIDIR%%/wikilib.d/PmWiki.DocumentationIndex
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Drafts
+%%PMWIKIDIR%%/wikilib.d/PmWiki.EditVariables
+%%PMWIKIDIR%%/wikilib.d/PmWiki.FAQ
+%%PMWIKIDIR%%/wikilib.d/PmWiki.FilePermissions
+%%PMWIKIDIR%%/wikilib.d/PmWiki.FmtPageName
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Forms
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Functions
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Glossary
+%%PMWIKIDIR%%/wikilib.d/PmWiki.GroupCustomizations
+%%PMWIKIDIR%%/wikilib.d/PmWiki.GroupFooter
+%%PMWIKIDIR%%/wikilib.d/PmWiki.GroupHeader
+%%PMWIKIDIR%%/wikilib.d/PmWiki.GroupHeaders
+%%PMWIKIDIR%%/wikilib.d/PmWiki.I18nVariables
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Images
+%%PMWIKIDIR%%/wikilib.d/PmWiki.IncludeOtherPages
+%%PMWIKIDIR%%/wikilib.d/PmWiki.InitialSetupTasks
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Installation
+%%PMWIKIDIR%%/wikilib.d/PmWiki.InterMap
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Internationalizations
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Introduction
+%%PMWIKIDIR%%/wikilib.d/PmWiki.LayoutVariables
+%%PMWIKIDIR%%/wikilib.d/PmWiki.LinkVariables
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Links
+%%PMWIKIDIR%%/wikilib.d/PmWiki.ListStyles
+%%PMWIKIDIR%%/wikilib.d/PmWiki.LocalCustomizations
+%%PMWIKIDIR%%/wikilib.d/PmWiki.MailingLists
+%%PMWIKIDIR%%/wikilib.d/PmWiki.MarkupExpressions
+%%PMWIKIDIR%%/wikilib.d/PmWiki.MarkupMasterIndex
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Notify
+%%PMWIKIDIR%%/wikilib.d/PmWiki.OtherVariables
+%%PMWIKIDIR%%/wikilib.d/PmWiki.PageDirectives
+%%PMWIKIDIR%%/wikilib.d/PmWiki.PageFileFormat
+%%PMWIKIDIR%%/wikilib.d/PmWiki.PageHistory
+%%PMWIKIDIR%%/wikilib.d/PmWiki.PageListTemplates
+%%PMWIKIDIR%%/wikilib.d/PmWiki.PageLists
+%%PMWIKIDIR%%/wikilib.d/PmWiki.PageTextVariables
+%%PMWIKIDIR%%/wikilib.d/PmWiki.PageVariables
+%%PMWIKIDIR%%/wikilib.d/PmWiki.PagelistVariables
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Passwords
+%%PMWIKIDIR%%/wikilib.d/PmWiki.PasswordsAdmin
+%%PMWIKIDIR%%/wikilib.d/PmWiki.PathVariables
+%%PMWIKIDIR%%/wikilib.d/PmWiki.PatrickMichaud
+%%PMWIKIDIR%%/wikilib.d/PmWiki.PmWiki
+%%PMWIKIDIR%%/wikilib.d/PmWiki.PmWikiPhilosophy
+%%PMWIKIDIR%%/wikilib.d/PmWiki.RefCount
+%%PMWIKIDIR%%/wikilib.d/PmWiki.ReleaseNotes
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Requirements
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Search
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Security
+%%PMWIKIDIR%%/wikilib.d/PmWiki.SecurityVariables
+%%PMWIKIDIR%%/wikilib.d/PmWiki.SimultaneousEdits
+%%PMWIKIDIR%%/wikilib.d/PmWiki.SitePageActions
+%%PMWIKIDIR%%/wikilib.d/PmWiki.SitePreferences
+%%PMWIKIDIR%%/wikilib.d/PmWiki.SkinTemplates
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Skins
+%%PMWIKIDIR%%/wikilib.d/PmWiki.SpecialCharacters
+%%PMWIKIDIR%%/wikilib.d/PmWiki.TableDirectives
+%%PMWIKIDIR%%/wikilib.d/PmWiki.TableOfContents
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Tables
+%%PMWIKIDIR%%/wikilib.d/PmWiki.TextFormattingRules
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Troubleshooting
+%%PMWIKIDIR%%/wikilib.d/PmWiki.UTF-8
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Upgrades
+%%PMWIKIDIR%%/wikilib.d/PmWiki.UpgradingFromPmWiki1
+%%PMWIKIDIR%%/wikilib.d/PmWiki.UploadVariables
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Uploads
+%%PMWIKIDIR%%/wikilib.d/PmWiki.UploadsAdmin
+%%PMWIKIDIR%%/wikilib.d/PmWiki.UrlApprovals
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Variables
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Version
+%%PMWIKIDIR%%/wikilib.d/PmWiki.WebFeeds
+%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiAdministrator
+%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiFarmTerminology
+%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiFarms
+%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiGroup
+%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiGroups
+%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiPage
+%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiSandbox
+%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiStructure
+%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiStyleExamples
+%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiStyles
+%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiTrails
+%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiWikiWeb
+%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiWord
+%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiWords
+%%PMWIKIDIR%%/wikilib.d/Site.AuthForm
+%%PMWIKIDIR%%/wikilib.d/Site.AuthUser
+%%PMWIKIDIR%%/wikilib.d/Site.EditForm
+%%PMWIKIDIR%%/wikilib.d/Site.EditQuickReference
+%%PMWIKIDIR%%/wikilib.d/Site.GroupAttributes
+%%PMWIKIDIR%%/wikilib.d/Site.PageActions
+%%PMWIKIDIR%%/wikilib.d/Site.PageListTemplates
+%%PMWIKIDIR%%/wikilib.d/Site.PageNotFound
+%%PMWIKIDIR%%/wikilib.d/Site.PmFormTemplates
+%%PMWIKIDIR%%/wikilib.d/Site.Preferences
+%%PMWIKIDIR%%/wikilib.d/Site.Search
+%%PMWIKIDIR%%/wikilib.d/Site.SideBar
+%%PMWIKIDIR%%/wikilib.d/Site.Site
+%%PMWIKIDIR%%/wikilib.d/Site.UploadQuickReference
+%%PMWIKIDIR%%/wikilib.d/SiteAdmin.AuthList
+%%PMWIKIDIR%%/wikilib.d/SiteAdmin.AuthUser
+%%PMWIKIDIR%%/wikilib.d/SiteAdmin.GroupAttributes
+%%PMWIKIDIR%%/wikilib.d/SiteAdmin.SiteAdmin
+%%PMWIKIDIR%%/wikilib.d/SiteAdmin.Status
diff --git a/www/proxygen/Makefile b/www/proxygen/Makefile
index 00dad51aaff6..f5743cb06dbc 100644
--- a/www/proxygen/Makefile
+++ b/www/proxygen/Makefile
@@ -1,6 +1,7 @@
PORTNAME= proxygen
DISTVERSIONPREFIX= v
-DISTVERSION= 2025.12.15.00
+DISTVERSION= 2026.01.05.00
+PORTREVISION= 1
CATEGORIES= www
MAINTAINER= yuri@FreeBSD.org
diff --git a/www/proxygen/distinfo b/www/proxygen/distinfo
index 50be98ca5116..1bdc1078ade8 100644
--- a/www/proxygen/distinfo
+++ b/www/proxygen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1765873872
-SHA256 (facebook-proxygen-v2025.12.15.00_GH0.tar.gz) = 25ee8cc6923c2ebb61c2ffef137207429db13b6de2a5b4a8004ba6555d4e9693
-SIZE (facebook-proxygen-v2025.12.15.00_GH0.tar.gz) = 1559608
+TIMESTAMP = 1767633395
+SHA256 (facebook-proxygen-v2026.01.05.00_GH0.tar.gz) = 61e5ec0b7bb57f087f57ab7952685b0b0a91fc484b89c271cf95e8c8e7d671d5
+SIZE (facebook-proxygen-v2026.01.05.00_GH0.tar.gz) = 1567573
diff --git a/www/proxygen/pkg-plist b/www/proxygen/pkg-plist
index a11db16bad19..a2573ddeb28a 100644
--- a/www/proxygen/pkg-plist
+++ b/www/proxygen/pkg-plist
@@ -281,6 +281,7 @@ include/proxygen/lib/http/structuredheaders/StructuredHeadersUtilities.h
include/proxygen/lib/http/webtransport/FlowController.h
include/proxygen/lib/http/webtransport/HTTPWebTransport.h
include/proxygen/lib/http/webtransport/QuicWebTransport.h
+include/proxygen/lib/http/webtransport/StreamPriorityQueue.h
include/proxygen/lib/http/webtransport/WebTransport.h
include/proxygen/lib/http/webtransport/WebTransportImpl.h
include/proxygen/lib/http/webtransport/WtEgressContainer.h
@@ -373,3 +374,4 @@ lib/libproxygenhqserver.so.1.34.6
lib/libproxygenhttpserver.so
lib/libproxygenhttpserver.so.1.34.6
lib/libquicwebtransport.so
+lib/libwt_stream_manager.so
diff --git a/www/py-aiohttp-session/Makefile b/www/py-aiohttp-session/Makefile
index 6094d05a45f4..324ebeafd54c 100644
--- a/www/py-aiohttp-session/Makefile
+++ b/www/py-aiohttp-session/Makefile
@@ -1,6 +1,6 @@
PORTNAME= aiohttp-session
DISTVERSION= 2.11.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-autobahn/Makefile b/www/py-autobahn/Makefile
index 18a165979de3..2fdbec00e903 100644
--- a/www/py-autobahn/Makefile
+++ b/www/py-autobahn/Makefile
@@ -1,7 +1,7 @@
PORTNAME= autobahn
DISTVERSIONPREFIX= v
DISTVERSION= 24.4.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-daphne/Makefile b/www/py-daphne/Makefile
index 20cf726e2e81..aa8f4644ce2a 100644
--- a/www/py-daphne/Makefile
+++ b/www/py-daphne/Makefile
@@ -1,6 +1,6 @@
PORTNAME= daphne
PORTVERSION= 4.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-dj-database-url/Makefile b/www/py-dj-database-url/Makefile
index c2c310fb0c80..1fb0c0c2e19d 100644
--- a/www/py-dj-database-url/Makefile
+++ b/www/py-dj-database-url/Makefile
@@ -1,5 +1,5 @@
PORTNAME= dj-database-url
-DISTVERSION= 3.0.1
+DISTVERSION= 3.1.0
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -9,11 +9,10 @@ MAINTAINER= kai@FreeBSD.org
COMMENT= Use Database URLs in your Django Application
WWW= https://github.com/jazzband/dj-database-url
-LICENSE= MIT
+LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PY_SETUPTOOLS} \
- ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}uv-build>=0.9.17<0.10.0:devel/py-uv-build@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django42>=4.2:www/py-django42@${PY_FLAVOR}
USES= python
diff --git a/www/py-dj-database-url/distinfo b/www/py-dj-database-url/distinfo
index 61f490f10390..48463277578e 100644
--- a/www/py-dj-database-url/distinfo
+++ b/www/py-dj-database-url/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1752304422
-SHA256 (dj_database_url-3.0.1.tar.gz) = 8994961efb888fc6bf8c41550870c91f6f7691ca751888ebaa71442b7f84eff8
-SIZE (dj_database_url-3.0.1.tar.gz) = 12556
+TIMESTAMP = 1767632371
+SHA256 (dj_database_url-3.1.0.tar.gz) = d80218426b83f9302c8d27d4fccf52de5cf0cab179f0645fb2839f37605d1353
+SIZE (dj_database_url-3.1.0.tar.gz) = 7924
diff --git a/www/py-dj52-drf-spectacular-sidecar/Makefile b/www/py-dj52-drf-spectacular-sidecar/Makefile
index 00b884237695..370a0d3b02ab 100644
--- a/www/py-dj52-drf-spectacular-sidecar/Makefile
+++ b/www/py-dj52-drf-spectacular-sidecar/Makefile
@@ -1,5 +1,5 @@
PORTNAME= drf-spectacular-sidecar
-DISTVERSION= 2025.12.1
+DISTVERSION= 2026.1.1
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj52-
diff --git a/www/py-dj52-drf-spectacular-sidecar/distinfo b/www/py-dj52-drf-spectacular-sidecar/distinfo
index a65111007d14..379157908dfa 100644
--- a/www/py-dj52-drf-spectacular-sidecar/distinfo
+++ b/www/py-dj52-drf-spectacular-sidecar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1765194792
-SHA256 (drf_spectacular_sidecar-2025.12.1.tar.gz) = d25d82ea2e6176ce4583812f73ac9f177dcd56141c11a9e9bf35f1b1878d5044
-SIZE (drf_spectacular_sidecar-2025.12.1.tar.gz) = 2460914
+TIMESTAMP = 1767633015
+SHA256 (drf_spectacular_sidecar-2026.1.1.tar.gz) = 6f7c173a8ddbbbdafc7a27e028614b65f07a89ca90f996a432d57460463b56be
+SIZE (drf_spectacular_sidecar-2026.1.1.tar.gz) = 2468060
diff --git a/www/py-dj52-social-auth-app-django/Makefile b/www/py-dj52-social-auth-app-django/Makefile
index 90d6699e9f66..7227cf075833 100644
--- a/www/py-dj52-social-auth-app-django/Makefile
+++ b/www/py-dj52-social-auth-app-django/Makefile
@@ -1,5 +1,5 @@
PORTNAME= social-auth-app-django
-DISTVERSION= 5.6.0
+DISTVERSION= 5.7.0
CATEGORIES= www security python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj52-
@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${PY_SETUPTOOLS} \
${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django52>=5.1:www/py-django52@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}social-auth-core>=4.4<5:security/py-social-auth-core@${PY_FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}social-auth-core>=4.8.3<5:security/py-social-auth-core@${PY_FLAVOR}
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
USES= python
diff --git a/www/py-dj52-social-auth-app-django/distinfo b/www/py-dj52-social-auth-app-django/distinfo
index 49b712c1247c..934a253cdb45 100644
--- a/www/py-dj52-social-auth-app-django/distinfo
+++ b/www/py-dj52-social-auth-app-django/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1761416481
-SHA256 (python-social-auth-social-app-django-5.6.0_GH0.tar.gz) = ecc84b6329899cf3d6990729c5881846bdc693ec3c43159a4fa906358ec5b59e
-SIZE (python-social-auth-social-app-django-5.6.0_GH0.tar.gz) = 30694
+TIMESTAMP = 1767631793
+SHA256 (python-social-auth-social-app-django-5.7.0_GH0.tar.gz) = ef6ff616fa00337bc50aced701814b045579d160cb6f6b4fafc9e10c1a9556b0
+SIZE (python-social-auth-social-app-django-5.7.0_GH0.tar.gz) = 30684
diff --git a/www/py-dj52-strawberry-graphql-django/Makefile b/www/py-dj52-strawberry-graphql-django/Makefile
index f9a1bf9038b8..e337c6405e0c 100644
--- a/www/py-dj52-strawberry-graphql-django/Makefile
+++ b/www/py-dj52-strawberry-graphql-django/Makefile
@@ -1,5 +1,5 @@
PORTNAME= strawberry-graphql-django
-DISTVERSION= 0.70.1
+DISTVERSION= 0.73.0
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj52-
@@ -12,11 +12,10 @@ WWW= https://github.com/strawberry-graphql/strawberry-django
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PY_SETUPTOOLS} \
- ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django52>=4.2:www/py-django52@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}asgiref>=3.8:www/py-asgiref@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dj52-strawberry-graphql>=0.283.2:devel/py-dj52-strawberry-graphql@${PY_FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}dj52-strawberry-graphql>=0.288.0:devel/py-dj52-strawberry-graphql@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist pep517
diff --git a/www/py-dj52-strawberry-graphql-django/distinfo b/www/py-dj52-strawberry-graphql-django/distinfo
index 201553da55a6..ac62279e69cc 100644
--- a/www/py-dj52-strawberry-graphql-django/distinfo
+++ b/www/py-dj52-strawberry-graphql-django/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1765276927
-SHA256 (strawberry_graphql_django-0.70.1.tar.gz) = 19496d3d2adf464c538f480b61e2b1825b6dbf09485673b6b6438b7065351e94
-SIZE (strawberry_graphql_django-0.70.1.tar.gz) = 86986
+TIMESTAMP = 1767717140
+SHA256 (strawberry_graphql_django-0.73.0.tar.gz) = 39f7205ca28a29763e3260548f7739ad6729a717d3f64b851208f57940c6360b
+SIZE (strawberry_graphql_django-0.73.0.tar.gz) = 86876
diff --git a/www/py-django-bootstrap3/Makefile b/www/py-django-bootstrap3/Makefile
index f2824aa5bf07..5067b8e13a3a 100644
--- a/www/py-django-bootstrap3/Makefile
+++ b/www/py-django-bootstrap3/Makefile
@@ -1,5 +1,5 @@
PORTNAME= django-bootstrap3
-DISTVERSION= 25.3
+DISTVERSION= 26.1
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-django-bootstrap3/distinfo b/www/py-django-bootstrap3/distinfo
index c641f01231cd..0a014323299f 100644
--- a/www/py-django-bootstrap3/distinfo
+++ b/www/py-django-bootstrap3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1765538148
-SHA256 (django_bootstrap3-25.3.tar.gz) = ad7a4eb7ac472a38c053b749ebd0a0b4288ff73c321018c19a36027904e5089a
-SIZE (django_bootstrap3-25.3.tar.gz) = 41293
+TIMESTAMP = 1767632704
+SHA256 (django_bootstrap3-26.1.tar.gz) = c437ec3bf19d9ef0b7554664b4dbea27c73fbd9927f8c7aa20559c68d38e8eea
+SIZE (django_bootstrap3-26.1.tar.gz) = 41832
diff --git a/www/py-django52/Makefile b/www/py-django52/Makefile
index ef003bff26dc..d2cb8d0e77f8 100644
--- a/www/py-django52/Makefile
+++ b/www/py-django52/Makefile
@@ -1,5 +1,5 @@
PORTNAME= django
-PORTVERSION= 5.2.9
+PORTVERSION= 5.2.10
CATEGORIES= www python
MASTER_SITES= PYPI \
https://media.djangoproject.com/releases/${PORTVERSION:R}/
diff --git a/www/py-django52/distinfo b/www/py-django52/distinfo
index 0f98e031e072..bc00a371bd8b 100644
--- a/www/py-django52/distinfo
+++ b/www/py-django52/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1764719939
-SHA256 (python/django-5.2.9.tar.gz) = 16b5ccfc5e8c27e6c0561af551d2ea32852d7352c67d452ae3e76b4f6b2ca495
-SIZE (python/django-5.2.9.tar.gz) = 10848762
+TIMESTAMP = 1767767625
+SHA256 (python/django-5.2.10.tar.gz) = 74df100784c288c50a2b5cad59631d71214f40f72051d5af3fdf220c20bdbbbe
+SIZE (python/django-5.2.10.tar.gz) = 10880754
diff --git a/www/py-django60/Makefile b/www/py-django60/Makefile
index 91c1881a40b9..f09d1478be39 100644
--- a/www/py-django60/Makefile
+++ b/www/py-django60/Makefile
@@ -1,5 +1,5 @@
PORTNAME= django
-PORTVERSION= 6.0
+PORTVERSION= 6.0.1
CATEGORIES= www python
MASTER_SITES= PYPI \
https://media.djangoproject.com/releases/${PORTVERSION:R}/
diff --git a/www/py-django60/distinfo b/www/py-django60/distinfo
index 1879287b947f..db8f95a1aea4 100644
--- a/www/py-django60/distinfo
+++ b/www/py-django60/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1764892533
-SHA256 (python/django-6.0.tar.gz) = 7b0c1f50c0759bbe6331c6a39c89ae022a84672674aeda908784617ef47d8e26
-SIZE (python/django-6.0.tar.gz) = 10932418
+TIMESTAMP = 1767767609
+SHA256 (python/django-6.0.1.tar.gz) = ed76a7af4da21551573b3d9dfc1f53e20dd2e6c7d70a3adc93eedb6338130a5f
+SIZE (python/django-6.0.1.tar.gz) = 11069565
diff --git a/www/py-drf-spectacular-sidecar/Makefile b/www/py-drf-spectacular-sidecar/Makefile
index be1fc6796077..5a40b374b6ce 100644
--- a/www/py-drf-spectacular-sidecar/Makefile
+++ b/www/py-drf-spectacular-sidecar/Makefile
@@ -1,5 +1,5 @@
PORTNAME= drf-spectacular-sidecar
-DISTVERSION= 2025.12.1
+DISTVERSION= 2026.1.1
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-drf-spectacular-sidecar/distinfo b/www/py-drf-spectacular-sidecar/distinfo
index a65111007d14..379157908dfa 100644
--- a/www/py-drf-spectacular-sidecar/distinfo
+++ b/www/py-drf-spectacular-sidecar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1765194792
-SHA256 (drf_spectacular_sidecar-2025.12.1.tar.gz) = d25d82ea2e6176ce4583812f73ac9f177dcd56141c11a9e9bf35f1b1878d5044
-SIZE (drf_spectacular_sidecar-2025.12.1.tar.gz) = 2460914
+TIMESTAMP = 1767633015
+SHA256 (drf_spectacular_sidecar-2026.1.1.tar.gz) = 6f7c173a8ddbbbdafc7a27e028614b65f07a89ca90f996a432d57460463b56be
+SIZE (drf_spectacular_sidecar-2026.1.1.tar.gz) = 2468060
diff --git a/www/py-fastapi/Makefile b/www/py-fastapi/Makefile
index 75b59c4e7a3d..fb89ca77eebf 100644
--- a/www/py-fastapi/Makefile
+++ b/www/py-fastapi/Makefile
@@ -1,5 +1,5 @@
PORTNAME= fastapi
-PORTVERSION= 0.115.14
+PORTVERSION= 0.128.0
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pdm-backend>=0:devel/py-pdm-backend@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pydantic2>=1.7.4:devel/py-pydantic2@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}starlette>=0.26.1:www/py-starlette@${PY_FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}starlette>=0.26.1:www/py-starlette@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}annotated-doc>=0:devel/py-annotated-doc@${PY_FLAVOR}
USES= cpe python
CPE_VENDOR= ${PORTNAME}_project
diff --git a/www/py-fastapi/distinfo b/www/py-fastapi/distinfo
index 2a3ee397327d..25e07ac27fed 100644
--- a/www/py-fastapi/distinfo
+++ b/www/py-fastapi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1751328090
-SHA256 (fastapi-0.115.14.tar.gz) = b1de15cdc1c499a4da47914db35d0e4ef8f1ce62b624e94e0e5824421df99739
-SIZE (fastapi-0.115.14.tar.gz) = 296263
+TIMESTAMP = 1767684921
+SHA256 (fastapi-0.128.0.tar.gz) = 1cc179e1cef10a6be60ffe429f79b829dce99d8de32d7acb7e6c8dfdf7f2645a
+SIZE (fastapi-0.128.0.tar.gz) = 365682
diff --git a/www/py-freenit/Makefile b/www/py-freenit/Makefile
index c3cef51fc9bf..b9b9535a51b3 100644
--- a/www/py-freenit/Makefile
+++ b/www/py-freenit/Makefile
@@ -1,5 +1,5 @@
PORTNAME= freenit
-DISTVERSION= 0.3.20
+DISTVERSION= 0.3.21
CATEGORIES= www devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-freenit/distinfo b/www/py-freenit/distinfo
index 48bdc9faf306..cd5a652d992d 100644
--- a/www/py-freenit/distinfo
+++ b/www/py-freenit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1753270744
-SHA256 (freenit-0.3.20.tar.gz) = d5a48c39d7d603ea9aeac8a29d25d9c3fb1fc5ebfbc4bf56f829b01f5e88906d
-SIZE (freenit-0.3.20.tar.gz) = 28417
+TIMESTAMP = 1767707534
+SHA256 (freenit-0.3.21.tar.gz) = 7cd7a47991e083126fb0ac7f12a23b14ec853676ca5653e79d7ee0b71f12bc0f
+SIZE (freenit-0.3.21.tar.gz) = 28430
diff --git a/www/py-mailman-hyperkitty/Makefile b/www/py-mailman-hyperkitty/Makefile
index b8b38bf1dc71..71415facdc17 100644
--- a/www/py-mailman-hyperkitty/Makefile
+++ b/www/py-mailman-hyperkitty/Makefile
@@ -1,5 +1,6 @@
PORTNAME= mailman-hyperkitty
PORTVERSION= 1.2.1
+PORTREVISION= 1
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-nikola/Makefile b/www/py-nikola/Makefile
index 16fa95e8bf0e..b544248c44c2 100644
--- a/www/py-nikola/Makefile
+++ b/www/py-nikola/Makefile
@@ -1,5 +1,6 @@
PORTNAME= nikola
DISTVERSION= 8.3.3
+PORTREVISION= 1
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-notebook/Makefile b/www/py-notebook/Makefile
index e0c08e691fab..2436231b2b3a 100644
--- a/www/py-notebook/Makefile
+++ b/www/py-notebook/Makefile
@@ -1,5 +1,6 @@
PORTNAME= notebook
PORTVERSION= 7.5.1
+PORTREVISION= 1
CATEGORIES= www python
MASTER_SITES= PYPI \
https://github.com/jupyter/notebook/releases/download/v${PORTVERSION}/
diff --git a/www/py-strawberry-graphql-django/Makefile b/www/py-strawberry-graphql-django/Makefile
index 59383fa3244c..1bfe9ccdf54f 100644
--- a/www/py-strawberry-graphql-django/Makefile
+++ b/www/py-strawberry-graphql-django/Makefile
@@ -1,5 +1,5 @@
PORTNAME= strawberry-graphql-django
-DISTVERSION= 0.70.1
+DISTVERSION= 0.73.0
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -12,11 +12,10 @@ WWW= https://github.com/strawberry-graphql/strawberry-django
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PY_SETUPTOOLS} \
- ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asgiref>=3.8:www/py-asgiref@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}django42>=4.2:www/py-django42@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}strawberry-graphql>=0.283.3:devel/py-strawberry-graphql@${PY_FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}strawberry-graphql>=0.288.0:devel/py-strawberry-graphql@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist pep517
diff --git a/www/py-strawberry-graphql-django/distinfo b/www/py-strawberry-graphql-django/distinfo
index 201553da55a6..ac62279e69cc 100644
--- a/www/py-strawberry-graphql-django/distinfo
+++ b/www/py-strawberry-graphql-django/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1765276927
-SHA256 (strawberry_graphql_django-0.70.1.tar.gz) = 19496d3d2adf464c538f480b61e2b1825b6dbf09485673b6b6438b7065351e94
-SIZE (strawberry_graphql_django-0.70.1.tar.gz) = 86986
+TIMESTAMP = 1767717140
+SHA256 (strawberry_graphql_django-0.73.0.tar.gz) = 39f7205ca28a29763e3260548f7739ad6729a717d3f64b851208f57940c6360b
+SIZE (strawberry_graphql_django-0.73.0.tar.gz) = 86876
diff --git a/www/reproxy/Makefile b/www/reproxy/Makefile
index 21eb5634c63d..49dd667f893b 100644
--- a/www/reproxy/Makefile
+++ b/www/reproxy/Makefile
@@ -1,7 +1,6 @@
PORTNAME= reproxy
-PORTVERSION= 1.2.3
+PORTVERSION= 1.4.0
DISTVERSIONPREFIX= v
-PORTREVISION= 1
CATEGORIES= www
MAINTAINER= danfe@FreeBSD.org
@@ -11,7 +10,7 @@ WWW= https://reproxy.io/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= go:modules
+USES= go:1.25+,modules
USE_GITHUB= yes
GH_ACCOUNT= umputun
diff --git a/www/reproxy/distinfo b/www/reproxy/distinfo
index 6173629a2615..0ddb1c48b288 100644
--- a/www/reproxy/distinfo
+++ b/www/reproxy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1740074776
-SHA256 (umputun-reproxy-v1.2.3_GH0.tar.gz) = 5156be192698e263134e486448de3099e389cdc508c4a311830f371395ecfe13
-SIZE (umputun-reproxy-v1.2.3_GH0.tar.gz) = 3449957
+TIMESTAMP = 1767383739
+SHA256 (umputun-reproxy-v1.4.0_GH0.tar.gz) = 48ccf99f6c00f7035ed29c061ec99fa5e451a3a47346beeddae30af09ee6b6b9
+SIZE (umputun-reproxy-v1.4.0_GH0.tar.gz) = 5745613
diff --git a/www/sogo/Makefile b/www/sogo/Makefile
index 4bcce44f8c75..db21be52a2c8 100644
--- a/www/sogo/Makefile
+++ b/www/sogo/Makefile
@@ -1,5 +1,6 @@
PORTNAME= sogo
PORTVERSION= 5.12.4
+PORTREVISION= 4
CATEGORIES= www gnustep
MASTER_SITES= https://packages.sogo.nu/sources/
PKGNAMESUFFIX= -${FLAVOR}
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 52ab01d14cf4..253b7c629874 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,6 +1,6 @@
PORTNAME= squid
DISTVERSION= 7.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= https://github.com/${PORTNAME}-cache/${PORTNAME}/releases/download/${PORTNAME:tu}_${DISTVERSION:S|.|_|g}/
diff --git a/www/squid/files/patch-configure b/www/squid/files/patch-configure
index f87538d28673..029b914fd6be 100644
--- a/www/squid/files/patch-configure
+++ b/www/squid/files/patch-configure
@@ -1,6 +1,22 @@
--- configure.orig 2025-10-28 20:25:31 UTC
+++ configure
-@@ -32420,15 +32420,15 @@ then :
+@@ -29214,7 +29214,14 @@ fi
+
+ fi
+
+- ac_fn_cxx_check_member "$LINENO" "struct arpreq" "arp_pa" "ac_cv_member_struct_arpreq_arp_pa" "
++if test "x$ac_cv_header_sys_socket_h" = xyes
++then :
++ printf "%s\n" "#define HAVE_SYS_SOCKET_H 1" >>confdefs.h
++
++fi
++
++
++ ac_fn_cxx_check_member "$LINENO" "struct arpreq" "arp_pa.sa_family" "ac_cv_member_struct_arpreq_arp_pa" "
+ #if HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
+@@ -32420,15 +32427,15 @@ then :
with_mit_krb5=yes
if test -d "$withval/lib64"
then :
@@ -19,7 +35,7 @@
fi
;;
esac
-@@ -33791,9 +33791,6 @@ else $as_nop
+@@ -33791,9 +33798,6 @@ else $as_nop
#elif HAVE_GSSAPI_H
#include <gssapi.h>
#endif
@@ -29,7 +45,7 @@
#if HAVE_GSSAPI_GSSAPI_GENERIC_H
#include <gssapi/gssapi_generic.h>
#endif
-@@ -33871,9 +33868,6 @@ else $as_nop
+@@ -33871,9 +33875,6 @@ else $as_nop
#elif HAVE_GSSAPI_H
#include <gssapi.h>
#endif
@@ -39,7 +55,7 @@
#if HAVE_GSSAPI_GSSAPI_GENERIC_H
#include <gssapi/gssapi_generic.h>
#endif
-@@ -35197,9 +35191,6 @@ else $as_nop
+@@ -35197,9 +35198,6 @@ else $as_nop
#elif HAVE_GSSAPI_H
#include <gssapi.h>
#endif
@@ -49,7 +65,7 @@
#if HAVE_GSSAPI_GSSAPI_GENERIC_H
#include <gssapi/gssapi_generic.h>
#endif
-@@ -35277,9 +35268,6 @@ else $as_nop
+@@ -35277,9 +35275,6 @@ else $as_nop
#elif HAVE_GSSAPI_H
#include <gssapi.h>
#endif
@@ -59,7 +75,7 @@
#if HAVE_GSSAPI_GSSAPI_GENERIC_H
#include <gssapi/gssapi_generic.h>
#endif
-@@ -35530,15 +35518,15 @@ then :
+@@ -35530,15 +35525,15 @@ then :
with_heimdal_krb5=yes
if test -d "$withval/lib64"
then :
@@ -78,7 +94,7 @@
fi
;;
esac
-@@ -36777,9 +36765,6 @@ else $as_nop
+@@ -36777,9 +36772,6 @@ else $as_nop
#elif HAVE_GSSAPI_H
#include <gssapi.h>
#endif
@@ -88,7 +104,7 @@
#if HAVE_GSSAPI_GSSAPI_GENERIC_H
#include <gssapi/gssapi_generic.h>
#endif
-@@ -36857,9 +36842,6 @@ else $as_nop
+@@ -36857,9 +36849,6 @@ else $as_nop
#elif HAVE_GSSAPI_H
#include <gssapi.h>
#endif
@@ -98,7 +114,7 @@
#if HAVE_GSSAPI_GSSAPI_GENERIC_H
#include <gssapi/gssapi_generic.h>
#endif
-@@ -37250,9 +37232,6 @@ else $as_nop
+@@ -37250,9 +37239,6 @@ else $as_nop
#elif HAVE_GSSAPI_H
#include <gssapi.h>
#endif
@@ -108,7 +124,7 @@
#if HAVE_GSSAPI_GSSAPI_GENERIC_H
#include <gssapi/gssapi_generic.h>
#endif
-@@ -37329,9 +37308,6 @@ else $as_nop
+@@ -37329,9 +37315,6 @@ else $as_nop
#elif HAVE_GSSAPI_H
#include <gssapi.h>
#endif
@@ -118,7 +134,7 @@
#if HAVE_GSSAPI_GSSAPI_GENERIC_H
#include <gssapi/gssapi_generic.h>
#endif
-@@ -40801,7 +40777,7 @@ BUILD_HELPER="NIS"
+@@ -40801,7 +40784,7 @@ BUILD_HELPER="NIS"
##
BUILD_HELPER="NIS"
@@ -127,7 +143,7 @@
do :
as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
-@@ -47289,6 +47265,7 @@ ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type
+@@ -47289,6 +47272,7 @@ ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type
ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type_cpu_set_t" "
#if HAVE_SCHED_H
@@ -135,7 +151,7 @@
#include <sched.h>
#endif
-@@ -49806,6 +49783,7 @@ else $as_nop
+@@ -49806,6 +49790,7 @@ else $as_nop
# include <sys/ioccom.h>
# include <netinet/in.h>
#undef minor_t
diff --git a/www/suitecrm/Makefile b/www/suitecrm/Makefile
index 9cb3ab83f856..935e163be5bb 100644
--- a/www/suitecrm/Makefile
+++ b/www/suitecrm/Makefile
@@ -1,5 +1,6 @@
PORTNAME= suitecrm
PORTVERSION= 8.7
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= https://suitecrm.com/download/148/suite87/564667/
DISTNAME= ${PORTNAME}-8-7-1
diff --git a/www/tor-browser/Makefile b/www/tor-browser/Makefile
index dc17a4db1534..de68b37489f5 100644
--- a/www/tor-browser/Makefile
+++ b/www/tor-browser/Makefile
@@ -1,5 +1,6 @@
PORTNAME= tor-browser
DISTVERSION= 16.0a1
+PORTREVISION= 1
CATEGORIES= www net security wayland
TAG_BASE= d366318349af0977ff23b492fa87e436e8672fdd
TAG_TOR= 45b67d3be52f79e8a4b361fd04ab12f342ab0016
diff --git a/www/tt-rss/Makefile b/www/tt-rss/Makefile
index 926ff9b62151..f189266070cc 100644
--- a/www/tt-rss/Makefile
+++ b/www/tt-rss/Makefile
@@ -1,5 +1,6 @@
PORTNAME= tt-rss
DISTVERSION= g20251222
+PORTREVISION= 4
PORTEPOCH= 2
CATEGORIES= www
PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile
index 57fc0c40b069..e18415edd59f 100644
--- a/www/ungoogled-chromium/Makefile
+++ b/www/ungoogled-chromium/Makefile
@@ -1,5 +1,5 @@
PORTNAME= ungoogled-chromium
-PORTVERSION= 143.0.7499.169
+PORTVERSION= 143.0.7499.192
PULSEMV= 16
PULSEV= ${PULSEMV}.1
UGVERSION= ${DISTVERSION}-1
diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo
index 51ea10b43a14..99e97852ad04 100644
--- a/www/ungoogled-chromium/distinfo
+++ b/www/ungoogled-chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1766182620
-SHA256 (chromium-143.0.7499.169-lite.tar.xz) = 0d03408450e552a1012321b61f5bb6e0f07a7f6e2ef111b519066876c1a5e747
-SIZE (chromium-143.0.7499.169-lite.tar.xz) = 1140789336
+TIMESTAMP = 1767860958
+SHA256 (chromium-143.0.7499.192-lite.tar.xz) = 01b2db3c4b89b96b3b18e889b7ef583ca243dd90d27f46c3c0115d298618501c
+SIZE (chromium-143.0.7499.192-lite.tar.xz) = 1140785448
SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
SIZE (pulseaudio-16.1.tar.gz) = 2763111
-SHA256 (chromium-143.0.7499.169-testdata.tar.xz) = 5b6f7f71ee54fe0ac61730b6f58b4a767b2bd6ff9f646cfbc6cc707d6205851f
-SIZE (chromium-143.0.7499.169-testdata.tar.xz) = 1155268416
-SHA256 (ungoogled-software-ungoogled-chromium-143.0.7499.169-143.0.7499.169-1_GH0.tar.gz) = 9061f9e31b36d1038a0880ca20749f8471ab5c48a8410e288ccce9721c467c84
-SIZE (ungoogled-software-ungoogled-chromium-143.0.7499.169-143.0.7499.169-1_GH0.tar.gz) = 651167
+SHA256 (chromium-143.0.7499.192-testdata.tar.xz) = 473e990578e16d3937612859c43ec5c22de8586172b6afe4bf4f63cf5ec062aa
+SIZE (chromium-143.0.7499.192-testdata.tar.xz) = 1155268448
+SHA256 (ungoogled-software-ungoogled-chromium-143.0.7499.192-143.0.7499.192-1_GH0.tar.gz) = 8241c2cffa1e843f2dea8e9ffe8087b7283f4dd2b0e9191c328586be7c1a9727
+SIZE (ungoogled-software-ungoogled-chromium-143.0.7499.192-143.0.7499.192-1_GH0.tar.gz) = 651163
diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc
index cea64fa90b72..2ee2b1015e10 100644
--- a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc
+++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/browser/data_manager/payments/payments_data_manager.cc.orig 2025-12-06 13:30:52 UTC
+--- components/autofill/core/browser/data_manager/payments/payments_data_manager.cc.orig 2026-01-07 14:40:58 UTC
+++ components/autofill/core/browser/data_manager/payments/payments_data_manager.cc
-@@ -480,7 +480,7 @@ void PaymentsDataManager::OnWebDataServiceRequestDone(
+@@ -479,7 +479,7 @@ void PaymentsDataManager::OnWebDataServiceRequestDone(
bool PaymentsDataManager::ShouldShowBnplSettings() const {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
// Check `kAutofillEnableBuyNowPayLater` only if the user has seen a BNPL
// suggestion before, or there are already linked issuers present, to avoid
// unnecessary feature flag checks. The linked issuer check is due to the fact
-@@ -1015,7 +1015,7 @@ void PaymentsDataManager::SetPrefService(PrefService*
+@@ -1014,7 +1014,7 @@ void PaymentsDataManager::SetPrefService(PrefService*
&PaymentsDataManager::OnAutofillPaymentsCardBenefitsPrefChange,
base::Unretained(this)));
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +18,7 @@
pref_registrar_.Add(
prefs::kAutofillBnplEnabled,
base::BindRepeating(&PaymentsDataManager::OnBnplEnabledPrefChange,
-@@ -1089,7 +1089,7 @@ void PaymentsDataManager::SetAutofillHasSeenIban() {
+@@ -1088,7 +1088,7 @@ void PaymentsDataManager::SetAutofillHasSeenIban() {
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +27,7 @@
bool PaymentsDataManager::IsAutofillHasSeenBnplPrefEnabled() const {
return prefs::HasSeenBnpl(pref_service_);
}
-@@ -2140,7 +2140,7 @@ bool PaymentsDataManager::AreEwalletAccountsSupported(
+@@ -2139,7 +2139,7 @@ bool PaymentsDataManager::AreEwalletAccountsSupported(
bool PaymentsDataManager::AreBnplIssuersSupported() const {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -36,7 +36,7 @@
return (app_locale_ == "en-US" || app_locale_ == "en-GB" ||
app_locale_ == "en-CA") &&
GetCountryCodeForExperimentGroup() == "US" &&
-@@ -2175,7 +2175,7 @@ void PaymentsDataManager::ClearAllCreditCardBenefits()
+@@ -2174,7 +2174,7 @@ void PaymentsDataManager::ClearAllCreditCardBenefits()
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h
index 72c696bb0e9a..7342678068fe 100644
--- a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h
+++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h
@@ -1,15 +1,15 @@
---- components/autofill/core/browser/data_manager/payments/payments_data_manager.h.orig 2025-12-06 13:30:52 UTC
+--- components/autofill/core/browser/data_manager/payments/payments_data_manager.h.orig 2026-01-07 14:40:58 UTC
+++ components/autofill/core/browser/data_manager/payments/payments_data_manager.h
-@@ -378,7 +378,7 @@ class PaymentsDataManager : public AutofillWebDataServ
+@@ -377,7 +377,7 @@ class PaymentsDataManager : public AutofillWebDataServ
+ void SetAutofillHasSeenIban();
- // TODO(crbug.com/430575808): Remove build flags.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
// Returns the value of the kAutofillHasSeenBnpl pref.
- virtual bool IsAutofillHasSeenBnplPrefEnabled() const;
+ bool IsAutofillHasSeenBnplPrefEnabled() const;
-@@ -726,7 +726,7 @@ class PaymentsDataManager : public AutofillWebDataServ
+@@ -725,7 +725,7 @@ class PaymentsDataManager : public AutofillWebDataServ
void ClearAllCreditCardBenefits();
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_suggestions_payments_payments__suggestion__generator.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_suggestions_payments_payments__suggestion__generator.cc
deleted file mode 100644
index 30300c5e97bc..000000000000
--- a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_suggestions_payments_payments__suggestion__generator.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/autofill/core/browser/suggestions/payments/payments_suggestion_generator.cc.orig 2025-12-06 13:30:52 UTC
-+++ components/autofill/core/browser/suggestions/payments/payments_suggestion_generator.cc
-@@ -1462,7 +1462,7 @@ std::vector<Suggestion> GetCreditCardSuggestionsForTou
- .GetBnplIssuers(),
- /*extracted_amount_in_micros=*/std::nullopt));
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- manager.client()
- .GetPersonalDataManager()
- .payments_data_manager()
diff --git a/www/varnish-libvmod-dynamic/Makefile b/www/varnish-libvmod-dynamic/Makefile
index acd5fef4124a..6408ce6f6f80 100644
--- a/www/varnish-libvmod-dynamic/Makefile
+++ b/www/varnish-libvmod-dynamic/Makefile
@@ -1,5 +1,6 @@
PORTNAME= libvmod-dynamic
PORTVERSION= 20250521
+PORTREVISION= 1
CATEGORIES= www
PKGNAMEPREFIX= varnish-
diff --git a/www/waterfox/Makefile b/www/waterfox/Makefile
index 427fac71057a..16746da642cc 100644
--- a/www/waterfox/Makefile
+++ b/www/waterfox/Makefile
@@ -1,5 +1,6 @@
PORTNAME= waterfox
DISTVERSION= 6.6.7
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www
diff --git a/www/web2ldap/Makefile b/www/web2ldap/Makefile
index 6df3c31126e2..51930ae626bf 100644
--- a/www/web2ldap/Makefile
+++ b/www/web2ldap/Makefile
@@ -1,6 +1,6 @@
PORTNAME= web2ldap
PORTVERSION= 1.8.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www python
MASTER_SITES= PYPI https://www.web2ldap.de/download/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}