diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index acf80c2b57c3..e021cbdb53cb 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -1,72 +1,72 @@ PORTNAME= thunderbird -DISTVERSION= 146.0.1 +DISTVERSION= 147.0 CATEGORIES= mail news net-im wayland MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}${DISTVERSIONSUFFIX}-candidates/build1/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above WWW= https://www.thunderbird.net/ BUILD_DEPENDS= nspr>=4.32:devel/nspr \ nss>=3.118:security/nss \ libevent>=2.1.8:devel/libevent \ harfbuzz>=10.1.0:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.45:graphics/png \ dav1d>=1.0.0:multimedia/dav1d \ libvpx>=1.15.0:multimedia/libvpx \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ nasm:devel/nasm \ yasm:devel/yasm \ zip:archivers/zip \ ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \ ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc@${LLVM_VERSION} \ wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION} LIB_DEPENDS= libjson-c.so:devel/json-c USE_GECKO= gecko CONFLICTS_INSTALL= thunderbird-esr # cannot use system icu: calendar is completely broken by # https://unicode-org.atlassian.net/browse/ICU-22132 (fix not in 76.1) USE_MOZILLA= -icu -sqlite CFLAGS_powerpc64le= -DSQLITE_BYTEORDER=1234 USES= tar:xz # helpful when testing beta WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} MOZ_OPTIONS= --enable-application=comm/mail --enable-official-branding MOZ_OPTIONS+= --with-system-bz2 --with-system-jsonc MOZ_OPTIONS+= --with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot MOZ_MK_OPTIONS= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 MOZ_EXPORT= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 PORTNAME_ICON= ${MOZILLA}.png PORTNAME_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js OPTIONS_DEFAULT=CANBERRA .include "${.CURDIR}/../../www/firefox/Makefile.options" post-extract: @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON:R}|;s|@MOZILLA@|${MOZILLA}|' \ <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/comm/mail/app/nsMailApp.cpp port-pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/defaults post-install: ${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${STAGEDIR}${PREFIX}/share/applications ${LN} -sf ${PORTNAME_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME_ICON} .include diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index 31840763fc1a..a9611ea1bf7f 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1765982493 -SHA256 (thunderbird-146.0.1.source.tar.xz) = 816c7add658c208ef6057ef86643ed9ecc0f4daafcae592a1ffe38d1a2108b38 -SIZE (thunderbird-146.0.1.source.tar.xz) = 781793608 +TIMESTAMP = 1767911566 +SHA256 (thunderbird-147.0.source.tar.xz) = 6de1b024123e16b2c3d62c5677b2843e7163c6f2358fe3d7e60b845104458121 +SIZE (thunderbird-147.0.source.tar.xz) = 780223936 diff --git a/mail/thunderbird/files/patch-bug1269654 b/mail/thunderbird/files/patch-bug1269654 new file mode 100644 index 000000000000..9f9265f86bfe --- /dev/null +++ b/mail/thunderbird/files/patch-bug1269654 @@ -0,0 +1,34 @@ +commit ff13efe458e7786d8c810342d25a6ba8e90a422b +Author: Christoph Moench-Tegeder + + 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 + : 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/mail/thunderbird/files/patch-bug1269654_comment5 b/mail/thunderbird/files/patch-bug1269654_comment5 deleted file mode 100644 index 0aa2d639d352..000000000000 --- a/mail/thunderbird/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 -# 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/mail/thunderbird/files/patch-cargo-checksums b/mail/thunderbird/files/patch-cargo-checksums new file mode 100644 index 000000000000..2108d8b24e8b --- /dev/null +++ b/mail/thunderbird/files/patch-cargo-checksums @@ -0,0 +1,61 @@ +commit 8af7a1568a6d4b28ec22aecb917d6d7dc59f1a18 +Author: Christoph Moench-Tegeder + + Remove several .gitmodules from cargo-checksum files + + these .gitmodules do not exist in the tar ball, but their + mention in the checkksum files will make the build unhappy + +diff --git comm/third_party/rust/cubeb-sys/.cargo-checksum.json comm/third_party/rust/cubeb-sys/.cargo-checksum.json +index b98304358fd..83bcc25c0d8 100644 +--- comm/third_party/rust/cubeb-sys/.cargo-checksum.json ++++ comm/third_party/rust/cubeb-sys/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{".cargo_vcs_info.json":"21c314647aed58ae4288dbae8dfe62a2c0617680e4e6f592cb72dafda7364d80","Cargo.lock":"78da21219e75ef238bf1df34221cf8cbe37ea0289ff0d750d776d544fdc9fb75","Cargo.toml":"f90fb04b9e0d54ef9e1529753b946689a5151b8fc25f29e26f1b435972858fb5","LICENSE":"8c044baa5d883274736eeece0b955249076c2697b826e576fce59496235b2cf5","build.rs":"188f2371401406862eadcdf7d2b5fbcc395c77a1a8ca5e29c3c7f6273734b52c","libcubeb/.clang-format":"9897a643853cadfb2d771b525a6e54832a8aaa6e1c589efffc6369c125764110","libcubeb/.github/workflows/build.yml":"8e228609cc41d02fc1777e046eaf53f577f2e8741013736c497d6f82acfd9e16","libcubeb/.github/workflows/docs.yml":"11afbc5de737985e73177123f7844095cf849b8916c3463deeaf7417193443a0","libcubeb/.gitignore":"30e326935b8d1ca90f4b6c7a021313cd7cd20b274e6558de4081c0840adb5846","libcubeb/.gitmodules":"65c86aa240aea1d6cb8559a0db73839f9a2f0d7a93d143c5fba0c485396874a0","libcubeb/AUTHORS":"829e45d138c7c8827799f302806fa4be8cd8bd4bad70a2fe26c3a27a5cf36948","libcubeb/CMakeLists.txt":"c14fe691bd5f7fb40fd4bd8caf95f6713a169268baba09e3875bced85028da2b","libcubeb/Config.cmake.in":"a156fb5cd30208aedcb9ef025d94187df82142fd4442e3a7d0e2a688668a3da9","libcubeb/INSTALL.md":"1fa77e15423e6f583c30861528cd2732d52a028982020cd3a7a9da4a452d7311","libcubeb/LICENSE":"44c6b5ae5ec3fe2fbc608b00e6f4896f4d2d5c7e525fcbaa3eaa3cf2f3d5a983","libcubeb/README.md":"1445df3577d2664f4baee1bb5a993cd41fc046f490eb15ba9da5aa6316d8916c","libcubeb/cmake/compile_tests/oss_is_v4.c":"482bcd4c569e8a26f4ab0fe3a3bed25e9d4b296bf678896a2cc1dc8abbad492d","libcubeb/cmake/sanitizers-cmake/.gitignore":"0ecc0e025e47a2c0d21866a6759177523f973b4232c747a283b9b1f2b572e037","libcubeb/cmake/sanitizers-cmake/CMakeLists.txt":"89b282c19b3897ff666f7847d5e679ae928ca7e76ffd0d23f7c58c9464048b61","libcubeb/cmake/sanitizers-cmake/LICENSE":"4b67e7ae8c91e68e1a929eb1cbaa4c773c6d19aa91aaa12c390cf9560d1c9799","libcubeb/cmake/sanitizers-cmake/README.md":"f3b85a594e1601ae65bb09393c56fbc8a98e3f3f49234e56f86bd78803c3544e","libcubeb/cmake/sanitizers-cmake/cmake/FindASan.cmake":"bd30b1c3cb0682b8a2b0b599f6c51fbf99ef4908b00eba8826f0d484c623b01b","libcubeb/cmake/sanitizers-cmake/cmake/FindMSan.cmake":"55e40f0994b47f8e779622af2007c69252d9456be99f4aa4fba7dd49c23d5580","libcubeb/cmake/sanitizers-cmake/cmake/FindSanitizers.cmake":"2ffd9717a49e3e9de848ec0d91097bdbab3f75a7866211d902f9659f59271ffc","libcubeb/cmake/sanitizers-cmake/cmake/FindTSan.cmake":"ceace234abd5a463ad1b8134ad06c4c8004895b2e8fc9edb67e64620ea97ca47","libcubeb/cmake/sanitizers-cmake/cmake/FindUBSan.cmake":"4720ec96ea42a2a9c07d887c1fc5562ed3e8c222f5778a18b78c46678b23f156","libcubeb/cmake/sanitizers-cmake/cmake/asan-wrapper":"4e543936e6374e24b80a0f92135c07c2e2101c0d110e51bddaf0e70ae8ec391e","libcubeb/cmake/sanitizers-cmake/cmake/sanitize-helpers.cmake":"c0c225f22bebd27eb68b807b2a61962d28afc61609735fe652c2fde6aa6a005b","libcubeb/cmake/sanitizers-cmake/tests/CMakeLists.txt":"64b7aea469a043f27414e3d652aaa89a03a11843d152c4cd42f30561e6ef51bc","libcubeb/cmake/sanitizers-cmake/tests/asan_test.cpp":"a25de95282aaee22d977d0b474468b946c1422b80b15424c04266dba038eba2e","libcubeb/cmake/sanitizers-cmake/tests/shortest.ext.test.cpp":"a25de95282aaee22d977d0b474468b946c1422b80b15424c04266dba038eba2e","libcubeb/cmake/toolchain-cross-mingw.cmake":"1c26749465364061ddf37aaa00f363eaf057c4b6a70181086e13b0a4d09bd376","libcubeb/cubeb.supp":"19f33e59f8dc91a327c923e44c2c3f9af0a043ce1d6a8cac275ba094b4bfe0da","libcubeb/docs/Doxyfile.in":"e721a50ccf3a010b9b5169b97f93a24f66bd4b88cade17b5b5088de19fa89716","libcubeb/include/cubeb/cubeb.h":"9d89beed6b79a1f3e0db052fa82fe4f8ce1f6939d0aed75f98d99c77dad90628","libcubeb/libcubeb.pc.in":"ad777cd17ee95516109555153541578692de40c719de22744f816c7dde863e67","libcubeb/scan-build-install.sh":"1ecf22aca367a4d02f810c4cb78db8636e08a12787e94e30c441ce439cf4a265","libcubeb/scripts/run-clang-format.sh":"f8cf4840b56f4b4a1732188eda36a3562a5fca79d353e38fd3eeaf2de2fb2ffe","libcubeb/src/android/audiotrack_definitions.h":"7cbb2a68924d20ec651cead5a923f63eb20192f109b597a3fa1594a79196693b","libcubeb/src/android/cubeb-output-latency.h":"a3862d9caf60d5c805a61e94bd696f6687ee30d2daa4acc25bd686be38497670","libcubeb/src/android/cubeb_media_library.h":"fa2a26a31adc727f35e9f746c287734ecbc7e15ceb52baf821429919a06c2e52","libcubeb/src/android/sles_definitions.h":"4c9c3cedfc06c8df479cc675fbadb1f158b8219223a96b9cffbcbfac738d7f28","libcubeb/src/cubeb-coreaudio-rs/.circleci/config.yml":"7f3dc865105ca8f33965a7958b1fe2e627ae2d5a703f3b2a4ab6e2e796018597","libcubeb/src/cubeb-coreaudio-rs/.editorconfig":"4e53b182bcc78b83d7e1b5c03efa14d22d4955c4ed2514d1ba4e99c1eb1a50ba","libcubeb/src/cubeb-coreaudio-rs/.githooks/pre-push":"8b8b26544cd56f54c0c33812551f786bb25cb08c86dbfeb6bf3daad881c826a1","libcubeb/src/cubeb-coreaudio-rs/.github/workflows/test.yml":"0184de4ad18c405b0b3c8145592e3f1c39ff916ade02749b44fe3b823f443c77","libcubeb/src/cubeb-coreaudio-rs/.gitignore":"9fe0b70e2daf21ec657a9abe5cf30d0cb91fb79eb84b1f205655f13aca9dbfac","libcubeb/src/cubeb-coreaudio-rs/.travis.yml":"dc07bac53f70f16c9bdf52264bdc58500ae6018c1b4c567bc7642f6b4ca3cc35","libcubeb/src/cubeb-coreaudio-rs/Cargo.lock":"422a0fa0cbefa12940bfaed0dd17548ee1462348c12b0e8b2c907c230a736486","libcubeb/src/cubeb-coreaudio-rs/Cargo.toml.in":"87a351640edc60ef0ce84868defa78c2527237ee1cc49c5e90c55c808a483f54","libcubeb/src/cubeb-coreaudio-rs/LICENSE":"6e6f56aff5bbf3cbc60747e152fb1a719bd0716aaf6d711c554f57d92e96297c","libcubeb/src/cubeb-coreaudio-rs/README.md":"0007782a05a5330f739ad789c19c82562c82e32386b0447000fc72c0d48405bc","libcubeb/src/cubeb-coreaudio-rs/build-audiounit-rust-in-cubeb.sh":"d228a05985dcd02ec1ecac66a2b64dae5a530804a25a7054ccc95905aedfb7ef","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/Cargo.lock":"5c95f50ac83e532b19d99c64eb5def6c508000d028e33a40d8b0bec653bea0e3","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/Cargo.toml.in":"9d8afec2aa957db8c47ca09340a47e5d9913549bdc226fb5fe88f7f707b0e22e","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/aggregate_device.rs":"7d2bd5f5fd7f3d008ebb69ad81f522ca0cb73db6d7b3e50ed1a63ea26ff721f4","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/audio_device_extensions.rs":"1b49e566d87bcd0b33e9402fb52f407f5b78902657c6c322b6964600eae24cc9","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/audio_object.rs":"cb527a92a3ee291cad55a6e44411d133e7e815e6904f9829f294b1234ef438c4","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/audio_unit.rs":"fe4198926bed493abe85c99ce31028520d7c768a4095cd3495817739330afa33","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/cf_mutable_dict.rs":"fc42edd270c6dfb02f123214d2d8e487bbd62b5bd923b71eec13190fd0104d2a","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/dispatch.rs":"1da419c7b79dd62544dd2a985350a6fde4ab0b4f92567b77b18ea493410fcbc6","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/lib.rs":"c93ed1411dd6cc39db44f57e0d7683bbc54745f84a3c9f9533a088895ec97abe","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/string.rs":"1ada92eef1c7f4e77495e21ee1efb0c9f90fb395a886f3687159b12a88a9f4d4","libcubeb/src/cubeb-coreaudio-rs/install_git_hook.sh":"d38c8e51e636f6b90b489621ac34ccd1d1b1f40dccce3d178ed1da1c5068f16d","libcubeb/src/cubeb-coreaudio-rs/install_rustfmt_clippy.sh":"4ae90d8dcb9757cb3ae4ae142ef80e5377c0dde61c63f4a3c32418646e80ca7b","libcubeb/src/cubeb-coreaudio-rs/run_device_tests.sh":"01f4c965443e0cd2d8a55df3a41fcc38aede5c8a0081ddf3101507a68a05dca5","libcubeb/src/cubeb-coreaudio-rs/run_sanitizers.sh":"84e93a0da137803018f37403511e8c92760be730426bf6cea34419d93d1a7ff8","libcubeb/src/cubeb-coreaudio-rs/run_tests.sh":"42444e9003905a44add6b7c165dbf87c2dbee290a964651fcf362ae9d894cf90","libcubeb/src/cubeb-coreaudio-rs/src/backend/aggregate_device.rs":"37a8f19af165a4413c512669ea4538b20adb128de0a490a13d5f54c2558c8327","libcubeb/src/cubeb-coreaudio-rs/src/backend/auto_release.rs":"050fdcee74cf46b9a8a85a877e166d72a853d33220f59cf734cbb6ea09daa441","libcubeb/src/cubeb-coreaudio-rs/src/backend/buffer_manager.rs":"0d1f9af94271ed4042e8cf0bb9658604c9f2e1ff9d931f50c1904d5ee372cb72","libcubeb/src/cubeb-coreaudio-rs/src/backend/device_property.rs":"4afd8961b4f722791f5c35a0934352a0a452f9d610e49c53820492788c9a77c1","libcubeb/src/cubeb-coreaudio-rs/src/backend/intern.rs":"11ca424e4eb77f8eb9fd5a6717d1e791facf9743156a8534f0016fcf64d57b0f","libcubeb/src/cubeb-coreaudio-rs/src/backend/mixer.rs":"c4d09291598cbffb2217b551770ec590f34b6dd6b461dd99b019d5bb70f0eef3","libcubeb/src/cubeb-coreaudio-rs/src/backend/mod.rs":"fe60523a82b31df4db41f1fc5fdd33464f3fea224e8b8974f3890cec26c225a4","libcubeb/src/cubeb-coreaudio-rs/src/backend/resampler.rs":"48bf8f56ae8d60dbabca6417b768000619abee8731ac3902164b45651ac08a4d","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/aggregate_device.rs":"22c28c48fc5f5aa760858ebe7311bdbcf07569a11d687590eb05002d97d70204","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/api.rs":"fd9eec01014e7f42e2c86ec098fe025f9f9cd9a8caff3abfc46559ddf96b6168","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/backlog.rs":"3b189a7e036543c467cc242af0ed3332721179ee2b1c8847a6db563546f1ac52","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/device_change.rs":"e09e75a5e654b1ac8359d086e6d28002fa4519debbedb8e1e7d091eba50e33f9","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/device_property.rs":"3a25dc22ef3e3dfee884538ad1be5a5789540a10da3915850b41680a0a3b1f07","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/interfaces.rs":"caa4383895aba2570d260432aa37018d8ddd6e3dca896b607bc27f82d91fc19d","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/manual.rs":"f5c3b54aea2af17f0f74fdd730852bf49bfeba8acd86fac3c69779a10b87a015","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/mod.rs":"8dba770023d7f9c4228f0e11915347f0e07da5fd818e3ee4478c4b197af9aa2a","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/parallel.rs":"a7ebd579339c40ca64c0757cc9da6baec641e670f226e1b2ec5049894700bd7a","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/tone.rs":"b028c67777b6453a26190b6a49785dfe28556adcbe179cb10862ce0d47ee8509","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/utils.rs":"33568e881e9e944949a2d58ebbb18b1e5e23dc097cbf7706fa2dd60d7730c500","libcubeb/src/cubeb-coreaudio-rs/src/backend/utils.rs":"6c3ffbcd602e6cc9f56deb9ecb07b2eef2e6f074ef924178e466f380aae5c595","libcubeb/src/cubeb-coreaudio-rs/src/capi.rs":"21b66b70545bf04ec719928004d1d9adb45b24ced51288f5b2993d79aaf78f5f","libcubeb/src/cubeb-coreaudio-rs/src/lib.rs":"a2c8a665cae5e26e6eee4c93b480f7ed708eeb6ba9ccf6f82b41c262f4b60015","libcubeb/src/cubeb-coreaudio-rs/todo.md":"efc1f012eb9a331a040cad4ac03aa79307f25885f71b6fb38f3ad7af8d7d515c","libcubeb/src/cubeb-internal.h":"50d2c0be2945136ff66666dbd8fcedc338f8f1d66eb2d9b09e09399193683ae8","libcubeb/src/cubeb-jni-instances.h":"8195554372bf60dea569873c9e5fb1106a2cf5dedc66a13d2bc967da0ff48a12","libcubeb/src/cubeb-jni.cpp":"cee58136cde7ef82045b59eee032e6eaf9bb677db12e053d8805ad9d67ee304e","libcubeb/src/cubeb-jni.h":"8f95cb6bc410bb62adae84f5e9d28fb8b57610107ed66941db0b4e4124548a72","libcubeb/src/cubeb-pulse-rs/.editorconfig":"bf047bd1da10cabb99eea666d1e57c321eba4716dccb3e4ed0e2c5fe3ca53858","libcubeb/src/cubeb-pulse-rs/.github/workflows/build.yml":"c91e5b2eeb7a70d9a03164c47e7e143a6eecb0f2b8cca65ae7c9a045e04f5933","libcubeb/src/cubeb-pulse-rs/.gitignore":"c97ecfda4d205190b973232dcfdb0c29748521c2534dd866bcc782f30b086738","libcubeb/src/cubeb-pulse-rs/AUTHORS":"0e0ac930a68ce2f6b876126b195add177f0d3886facb9260f4d9b69f1988f0cc","libcubeb/src/cubeb-pulse-rs/Cargo.lock":"35b7a4cfdc483e44bff4ada19c1afa44beac1904d19bab7ddc64a94adb257aab","libcubeb/src/cubeb-pulse-rs/Cargo.toml.in":"bac38dfc218f8eb3d11aefa4ab4ec598751385e95d5f54716becf587257c88a9","libcubeb/src/cubeb-pulse-rs/LICENSE":"44c6b5ae5ec3fe2fbc608b00e6f4896f4d2d5c7e525fcbaa3eaa3cf2f3d5a983","libcubeb/src/cubeb-pulse-rs/README.md":"0079450bb4b013bac065ed1750851e461a3710ebad1f323817da1cb82db0bc4f","libcubeb/src/cubeb-pulse-rs/pulse-ffi/Cargo.toml.in":"86bb1c8ebc438416c3a1f71b41494f19a85f698860b8c12d4875c8247f9c3664","libcubeb/src/cubeb-pulse-rs/pulse-ffi/src/ffi_funcs.rs":"a16646c5e7c49e94b907a7a404cfcadf3007688005c689cca936f0c2ee2e28e6","libcubeb/src/cubeb-pulse-rs/pulse-ffi/src/ffi_types.rs":"2ca56bc3638a40d331e53117a5dd175d0a6e102b1e0eccb9c2adc565c6861a33","libcubeb/src/cubeb-pulse-rs/pulse-ffi/src/lib.rs":"6aff308de11954a067d0f6ef95bf3126aabb6d928a5191e91d9a38ebadba91c2","libcubeb/src/cubeb-pulse-rs/pulse-rs/Cargo.toml.in":"16016702e7ceebb068a6222f4ba42978f5c570a1dbaf7dc159aada8fd4e9d3d8","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/context.rs":"49893b6b5190f228797b8d8c1b23830a8627176e6d73a1d856f5139ebb09774b","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/error.rs":"cbbdbae9aa614743a9dd70ac304605f24ad0256a640982dd4217b1894aa96b8d","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/lib.rs":"1fd45911e927782381dff20a848609cf6b777edd6b8e9321bcb31fc25a88e84d","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/mainloop_api.rs":"e1ed99071fb106d997df1f2889c49d967f51c9e290be023619ce7ab6795b2feb","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/operation.rs":"ae0a57a654d5d6d98e68036cea179322e936ee8e7878a9cc006471b9517e703d","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/proplist.rs":"47fc0b327db76a4e76f4c3bce28c522ef358cf0df273ffb62389939cc5ab1429","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/stream.rs":"2e93f480a3ba115a942182bfb06d2a01249d9ecb924f4c61545790fc02d99fa0","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/threaded_mainloop.rs":"2399e67a1c0c5fb0793e36c7a03edce58bffccb54fbf8a1c36bdd60c8fe364bf","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/util.rs":"5e6179f397604520bb3fad6899c9aebf1605802dee008f1e1ccab55be74705dd","libcubeb/src/cubeb-pulse-rs/src/backend/context.rs":"e8d10bfc619738c34ebea18a06b23ffc7ab4a4f18f079b5535f50316648ab567","libcubeb/src/cubeb-pulse-rs/src/backend/cork_state.rs":"4a0f1afc7d9f333dac89218cc56d7d32fbffb487cd48c1c9a4e03d79cb3b5e28","libcubeb/src/cubeb-pulse-rs/src/backend/intern.rs":"11ca424e4eb77f8eb9fd5a6717d1e791facf9743156a8534f0016fcf64d57b0f","libcubeb/src/cubeb-pulse-rs/src/backend/mod.rs":"dfb30ec497d6215e4535e936fea8fe3a407ef24dc1cec43b52c0ffa923d9229c","libcubeb/src/cubeb-pulse-rs/src/backend/stream.rs":"8cc1afdbe9187d33a944c2289c18d83698db37549c0a03f7c198b817c662d8c5","libcubeb/src/cubeb-pulse-rs/src/capi.rs":"fa0fa020f0d0efe55aa0fc3596405e8407bbe2cbe6c7a558345304e6da87994e","libcubeb/src/cubeb-pulse-rs/src/lib.rs":"b41bbdc562cbfb130ed7c1e53fe69944774f515705341d8ce48a2f82c8c0c2c5","libcubeb/src/cubeb-speex-resampler.h":"dbf543eee4cc6e40ba3531a39d327e2cec884c19e26c570aa7eae0647e5f7420","libcubeb/src/cubeb.c":"01bde1830c8957e88eaf824c0fe2d65cf2e691ad9dde9f65aee558ef7bcc5852","libcubeb/src/cubeb_aaudio.cpp":"a7cf6835fc0b4d5c301f06b0271da5a03037082b78bbb924339560d389011954","libcubeb/src/cubeb_alsa.c":"0f061750afa89f0054a4655bbb23dd35f77124c53a90fcce1eccdb32e23937a9","libcubeb/src/cubeb_android.h":"396922d2bb994c39acb745f7449a78e8dee00ad5146583f647545a3e0a9dd010","libcubeb/src/cubeb_array_queue.h":"86ab9c32eef5f4427413091d5932843ee870144475cddb1f0e18cd39d49f6115","libcubeb/src/cubeb_assert.h":"07841be6cca09999a913d0c1e61ab0a5de02200efed5b66fbf7c481b1d0489b0","libcubeb/src/cubeb_audio_dump.cpp":"28f8b302a786fad6221d97ad4c06f6317657881f2521b67a490f28596efe3442","libcubeb/src/cubeb_audio_dump.h":"93da746cff7326ce904bd2ef1aef400d8fd36e8ab2fceb372d459127003a5dae","libcubeb/src/cubeb_audiotrack.c":"18382213f4b3a9808f3dd6b8c18173d21c7230718ecb3771762850ce6420e602","libcubeb/src/cubeb_audiounit.cpp":"4285a1ec1bb65e502443b82e1f988ed7af9eb2957c985fe2168574e17ffe8b06","libcubeb/src/cubeb_jack.cpp":"9493ca3f274cd9a5dba4b5023783747bf186c4fed0dc14ff34f841dc94c988ee","libcubeb/src/cubeb_kai.c":"3b6d52e4b0eaf2db34bcf902baf4784f72805bfb6349ebe769764d09195186c5","libcubeb/src/cubeb_log.cpp":"387f3f8989b260a1ca6067c25a0fd868e38c3d5bb81263924fad5341415a96fe","libcubeb/src/cubeb_log.h":"8511c7640f2856d107900f6c40775c5dfe711187204fb5b2557562b1a855399f","libcubeb/src/cubeb_mixer.cpp":"6779938a7fd70b0ad23fdf1194dab27b57e9afb8f03ff45885601796f76a1dfe","libcubeb/src/cubeb_mixer.h":"64425dcefad3632acf68d6ae9fbdf59ff7b7b0e92487c34d18cd67f52431dc23","libcubeb/src/cubeb_opensl.cpp":"617ba1316e4a31cafb08d9c26e3c6c66690563741748b6131a22b5e02d170e3b","libcubeb/src/cubeb_oss.c":"743dfe68354963e4a8553eb57fe36af6a639a7769da0b767afda5294edf865b9","libcubeb/src/cubeb_osx_run_loop.cpp":"e5c9ef5591eced85310af94575f84ea5d3051c7aaef4e41cfd221f8f8b7c4331","libcubeb/src/cubeb_osx_run_loop.h":"aa10dd0d6111973b37488d83403d204ecf6001a3530aac6bffab00c6bb31df15","libcubeb/src/cubeb_pulse.c":"034b4ad4eb072573ff2b97ed33c53622be4ff12523fb21d470d6106ca520a5e7","libcubeb/src/cubeb_resampler.cpp":"8d05ffd13a273300e5faa28d2306d14cad14e5192f1ceb4eed020fd272c85355","libcubeb/src/cubeb_resampler.h":"9e768ae9045de82cf2cdd8d1c6f5f20020c5a83ef06a0e7fc4f372e280e5a739","libcubeb/src/cubeb_resampler_internal.h":"7422c8d06cb2da8439568d7c37a98eae725e190ba428eff3763cf696584dd16b","libcubeb/src/cubeb_ring_array.h":"cd5b7d807c229e925fe61416d70b6ecfe41c735c361bfc01593ed10a6dad5849","libcubeb/src/cubeb_ringbuffer.h":"8f5dc7a58d8b7ad265ff3bbcac80ae160ff22243d869a5b502bf413fa58fd9b0","libcubeb/src/cubeb_sndio.c":"07b47b0993c4c37f45cef8df08bc555d7915354792edf4ee57b3e026ccf23a14","libcubeb/src/cubeb_strings.c":"6004618393cf4dc3e06cd4f44cb53589459dad21384de3695f8b3d16774edf26","libcubeb/src/cubeb_strings.h":"312f5c2230d9a02e369be1d991ec44a1793373046f208529b3cc54cb9a5b0610","libcubeb/src/cubeb_sun.c":"c9aaf34c2163dde73be4c98a4cf1059c00ca66954a78a9680384c9cb5a8927ed","libcubeb/src/cubeb_tracing.h":"def71a9c9659383ea3cf7e12ff0ba2f2c51a0ead03fef6d418eafde6e70c8f39","libcubeb/src/cubeb_triple_buffer.h":"f1d9b68a83c2463af6bce4e475f3a638705241cce920dceaeefb6b864f44f62d","libcubeb/src/cubeb_utils.cpp":"8f41899df2f5f82541f816dadcee3d18baab7a1aecf2bc6d0b382567209351aa","libcubeb/src/cubeb_utils.h":"7a3b1e2a97752e96ff11badc19149e1582d4289e4e200817a9ed3f905bf8ab10","libcubeb/src/cubeb_utils_unix.h":"2e67e39daed8ec17092a2d1a9b660a3d4e153fc351698d9e1f3d51ef974979c5","libcubeb/src/cubeb_utils_win.h":"4d7a397f475e08dd7af47fdc4003e9f78cf9058e095348eeb554135ea3c3c454","libcubeb/src/cubeb_wasapi.cpp":"e249d54458a5af823f88c0ee35950991494dac3f736ec847143462a8acbc002e","libcubeb/src/cubeb_winmm.c":"089987489bea20690e825b3107e31446b89270f316fa8219b2c501941c3bc98d","libcubeb/subprojects/speex/arch.h":"2300bce68c588270cdc684dc7f01377e5e251529f4545d93771e111c56d51b0f","libcubeb/subprojects/speex/fixed_generic.h":"306ee7453677fa6067f16c79d358c6c90a9d3d008850b493cdaa59c07e6375c1","libcubeb/subprojects/speex/resample.c":"9c3a1c64ecf3750af82c980d01ea73d3682f73c332a580465d1e787e5c54cd00","libcubeb/subprojects/speex/resample_neon.h":"7d3fd7af9a1ddde22518b9c7b4419073b72b2dfa5be4c3bc8796992bc87b3da0","libcubeb/subprojects/speex/resample_sse.h":"5a196d8e2d8ab5c956f5252f09f5ddc55aee1f99b1341af3fa54a1f4c2157924","libcubeb/subprojects/speex/speex_config_types.h":"24e3ffbf29e5519611a48e5acb959645b01d166dcb4369380d5f776c3f53d4cd","libcubeb/subprojects/speex/speex_resampler.h":"7e439ec0dd30c32216b3ced17135f8992e5aaf53389d3f5996a7d900c453e65f","libcubeb/subprojects/speex/stack_alloc.h":"e8a2fc0874942d2c7177475fcc141fdd0c0156200b8a4e7656d4a20313e2e569","libcubeb/test/README.md":"1c11b038f87daf10ea78abc17bdbdd157940c241df548c24d5872d142a98c1af","libcubeb/test/common.h":"9ef928375c3cea4345f09e8f75678f35a8866a10a29fb7d93cf02259653cdd97","libcubeb/test/test_audio.cpp":"cf094d11993c9d7602cc0a7f2dcf92d47ffd6142fdd5813c3010143fa08db080","libcubeb/test/test_audio_dump.cpp":"5716fd3ea828a26dd80252cafa2334404003639663334b9a96c87df2831b5553","libcubeb/test/test_callback_ret.cpp":"4f004b79476c44e059136478e2368c030920c9137180637e548eb2e6db7e5f6e","libcubeb/test/test_device_changed_callback.cpp":"9e02dd526602d7abfc5485c80c8b86ffa27c0a8c87e587a850f77eff9bfd14aa","libcubeb/test/test_devices.cpp":"1ea25e6ae19940d224011cd8c255d1038a858d1d9be0e7c32ea0455a0e8163f9","libcubeb/test/test_duplex.cpp":"2297abf827e21fe8695cae63c7e8076bc59e6ab4350aa8dbbd821e0f079732c4","libcubeb/test/test_latency.cpp":"a1d75355e49895ea105eb814d20c6e1a37e8cf98be01f73832f4768eb7e1176f","libcubeb/test/test_logging.cpp":"72522cf7794212dceb2f26a98f5c9297a6366f2eab90128066f59422a6edb7c5","libcubeb/test/test_loopback.cpp":"92dbdebd71aa2e844694100818ac11e5145bccb01aa3e6d7ce3bc990931dda3d","libcubeb/test/test_overload_callback.cpp":"593c36fc78ea2fccd4dc2b6e565cb3bf53503f402522737e9005d9eab7fc4732","libcubeb/test/test_record.cpp":"90484423d4e5c4ffb8e6f65c9bae1f7384cac7eeeb4f42c0fcca768ee0e5c8e6","libcubeb/test/test_resampler.cpp":"57d6c0754a13ba6062868029b3daf59db591c69d1d0c8662c5d750a2a031f63f","libcubeb/test/test_ring_array.cpp":"c0420d04c914b0f61bdc81b9c4511c1b535518b2f87f32a5539f9ca6310dd5b1","libcubeb/test/test_ring_buffer.cpp":"cf247fda806f976d2b8dd2790e5a25bda68943423d7b0bcd4ac69a57f94e2f88","libcubeb/test/test_sanity.cpp":"b1b474be02e90fa310c265d4abdc712e5637bc5420c670f26d79be98b092804f","libcubeb/test/test_tone.cpp":"75e32348aa18583130bc3f2849862a4153729f19f7e5b1bcc9e91cc6ab7bcbe7","libcubeb/test/test_triple_buffer.cpp":"b1024e57581ec066d81e2a4749c71a8392ec81fa9a22e0e0c1d124f7ca86427d","libcubeb/test/test_utils.cpp":"ec18e3c14519d053cfd544ae59b2ba39716500cd7da72b5b50366eefff0a0481","libcubeb/tools/cubeb-test.cpp":"e1a29a10ba824a49dad4d0d6c9f495786148f0dc942558ae990786dba6065f4e","src/audio_dump.rs":"2491741d58a609e93de1a46d003fd4e26e4cd88cd89d4c9584635141964e0274","src/callbacks.rs":"a83d9a16ee66b3cd7100dd06e1f409698a727d642df0dfa797c067b5cf1def66","src/channel.rs":"02fd91384195180a56663aba87f00660c20e71fe7654c7b68d8f470173f40d5f","src/context.rs":"23b9326f58494b0860d080ec5f0e76be2325172da7f0274ebba152dc35182f3b","src/device.rs":"bd20afac637ea964df950ae6df30ddbc9ea7a865c7b471ba4c58d632b8f72708","src/error.rs":"406e3b843ed2d263fe677c4b34fb96a6d780a68bcb56a6f85f041d20d70227bd","src/format.rs":"d4d27790c20eab0b16592f60d5e487425a45a268cf4c74cf843c10ac91bbff4c","src/internal.rs":"c3af5f53dc7957860bf3bc0cd9737d094fb8ac000e7b40c569304cfa76a43145","src/lib.rs":"0fa0602859889c4f608ca4178c45f43d7e4b258ea0185a64341fab4532ebcd0e","src/log.rs":"8ac402b6c4d20db651cbddb87b27b3aa5ab0c3c50dac08a6c09fb1b7f9a3a391","src/macros.rs":"caef13f5d23f7a3ec1a54ec3ca2390ac4ad89d521893f1d0864daf70d57a20aa","src/mixer.rs":"e72e92855614da187da6419ed0a115062a05670cb73443b2ea4313d8f5108a68","src/resampler.rs":"b16bd6a4b1179b25f2a5391133fcd4410467e6a68c0a46cf15a12d280c1862e0","src/stream.rs":"e736794dea181be0cde83ff78079efa3bb1c64e38b8c57615590fa4c6aadf2ac"},"package":"cd2114801cd652119ace9e050a16d6641475fe3341ef45c58c9377fa45cbe3bf"} +\ No newline at end of file ++{"files":{".cargo_vcs_info.json":"21c314647aed58ae4288dbae8dfe62a2c0617680e4e6f592cb72dafda7364d80","Cargo.lock":"78da21219e75ef238bf1df34221cf8cbe37ea0289ff0d750d776d544fdc9fb75","Cargo.toml":"f90fb04b9e0d54ef9e1529753b946689a5151b8fc25f29e26f1b435972858fb5","LICENSE":"8c044baa5d883274736eeece0b955249076c2697b826e576fce59496235b2cf5","build.rs":"188f2371401406862eadcdf7d2b5fbcc395c77a1a8ca5e29c3c7f6273734b52c","libcubeb/.clang-format":"9897a643853cadfb2d771b525a6e54832a8aaa6e1c589efffc6369c125764110","libcubeb/.github/workflows/build.yml":"8e228609cc41d02fc1777e046eaf53f577f2e8741013736c497d6f82acfd9e16","libcubeb/.github/workflows/docs.yml":"11afbc5de737985e73177123f7844095cf849b8916c3463deeaf7417193443a0","libcubeb/.gitignore":"30e326935b8d1ca90f4b6c7a021313cd7cd20b274e6558de4081c0840adb5846","libcubeb/AUTHORS":"829e45d138c7c8827799f302806fa4be8cd8bd4bad70a2fe26c3a27a5cf36948","libcubeb/CMakeLists.txt":"c14fe691bd5f7fb40fd4bd8caf95f6713a169268baba09e3875bced85028da2b","libcubeb/Config.cmake.in":"a156fb5cd30208aedcb9ef025d94187df82142fd4442e3a7d0e2a688668a3da9","libcubeb/INSTALL.md":"1fa77e15423e6f583c30861528cd2732d52a028982020cd3a7a9da4a452d7311","libcubeb/LICENSE":"44c6b5ae5ec3fe2fbc608b00e6f4896f4d2d5c7e525fcbaa3eaa3cf2f3d5a983","libcubeb/README.md":"1445df3577d2664f4baee1bb5a993cd41fc046f490eb15ba9da5aa6316d8916c","libcubeb/cmake/compile_tests/oss_is_v4.c":"482bcd4c569e8a26f4ab0fe3a3bed25e9d4b296bf678896a2cc1dc8abbad492d","libcubeb/cmake/sanitizers-cmake/.gitignore":"0ecc0e025e47a2c0d21866a6759177523f973b4232c747a283b9b1f2b572e037","libcubeb/cmake/sanitizers-cmake/CMakeLists.txt":"89b282c19b3897ff666f7847d5e679ae928ca7e76ffd0d23f7c58c9464048b61","libcubeb/cmake/sanitizers-cmake/LICENSE":"4b67e7ae8c91e68e1a929eb1cbaa4c773c6d19aa91aaa12c390cf9560d1c9799","libcubeb/cmake/sanitizers-cmake/README.md":"f3b85a594e1601ae65bb09393c56fbc8a98e3f3f49234e56f86bd78803c3544e","libcubeb/cmake/sanitizers-cmake/cmake/FindASan.cmake":"bd30b1c3cb0682b8a2b0b599f6c51fbf99ef4908b00eba8826f0d484c623b01b","libcubeb/cmake/sanitizers-cmake/cmake/FindMSan.cmake":"55e40f0994b47f8e779622af2007c69252d9456be99f4aa4fba7dd49c23d5580","libcubeb/cmake/sanitizers-cmake/cmake/FindSanitizers.cmake":"2ffd9717a49e3e9de848ec0d91097bdbab3f75a7866211d902f9659f59271ffc","libcubeb/cmake/sanitizers-cmake/cmake/FindTSan.cmake":"ceace234abd5a463ad1b8134ad06c4c8004895b2e8fc9edb67e64620ea97ca47","libcubeb/cmake/sanitizers-cmake/cmake/FindUBSan.cmake":"4720ec96ea42a2a9c07d887c1fc5562ed3e8c222f5778a18b78c46678b23f156","libcubeb/cmake/sanitizers-cmake/cmake/asan-wrapper":"4e543936e6374e24b80a0f92135c07c2e2101c0d110e51bddaf0e70ae8ec391e","libcubeb/cmake/sanitizers-cmake/cmake/sanitize-helpers.cmake":"c0c225f22bebd27eb68b807b2a61962d28afc61609735fe652c2fde6aa6a005b","libcubeb/cmake/sanitizers-cmake/tests/CMakeLists.txt":"64b7aea469a043f27414e3d652aaa89a03a11843d152c4cd42f30561e6ef51bc","libcubeb/cmake/sanitizers-cmake/tests/asan_test.cpp":"a25de95282aaee22d977d0b474468b946c1422b80b15424c04266dba038eba2e","libcubeb/cmake/sanitizers-cmake/tests/shortest.ext.test.cpp":"a25de95282aaee22d977d0b474468b946c1422b80b15424c04266dba038eba2e","libcubeb/cmake/toolchain-cross-mingw.cmake":"1c26749465364061ddf37aaa00f363eaf057c4b6a70181086e13b0a4d09bd376","libcubeb/cubeb.supp":"19f33e59f8dc91a327c923e44c2c3f9af0a043ce1d6a8cac275ba094b4bfe0da","libcubeb/docs/Doxyfile.in":"e721a50ccf3a010b9b5169b97f93a24f66bd4b88cade17b5b5088de19fa89716","libcubeb/include/cubeb/cubeb.h":"9d89beed6b79a1f3e0db052fa82fe4f8ce1f6939d0aed75f98d99c77dad90628","libcubeb/libcubeb.pc.in":"ad777cd17ee95516109555153541578692de40c719de22744f816c7dde863e67","libcubeb/scan-build-install.sh":"1ecf22aca367a4d02f810c4cb78db8636e08a12787e94e30c441ce439cf4a265","libcubeb/scripts/run-clang-format.sh":"f8cf4840b56f4b4a1732188eda36a3562a5fca79d353e38fd3eeaf2de2fb2ffe","libcubeb/src/android/audiotrack_definitions.h":"7cbb2a68924d20ec651cead5a923f63eb20192f109b597a3fa1594a79196693b","libcubeb/src/android/cubeb-output-latency.h":"a3862d9caf60d5c805a61e94bd696f6687ee30d2daa4acc25bd686be38497670","libcubeb/src/android/cubeb_media_library.h":"fa2a26a31adc727f35e9f746c287734ecbc7e15ceb52baf821429919a06c2e52","libcubeb/src/android/sles_definitions.h":"4c9c3cedfc06c8df479cc675fbadb1f158b8219223a96b9cffbcbfac738d7f28","libcubeb/src/cubeb-coreaudio-rs/.circleci/config.yml":"7f3dc865105ca8f33965a7958b1fe2e627ae2d5a703f3b2a4ab6e2e796018597","libcubeb/src/cubeb-coreaudio-rs/.editorconfig":"4e53b182bcc78b83d7e1b5c03efa14d22d4955c4ed2514d1ba4e99c1eb1a50ba","libcubeb/src/cubeb-coreaudio-rs/.githooks/pre-push":"8b8b26544cd56f54c0c33812551f786bb25cb08c86dbfeb6bf3daad881c826a1","libcubeb/src/cubeb-coreaudio-rs/.github/workflows/test.yml":"0184de4ad18c405b0b3c8145592e3f1c39ff916ade02749b44fe3b823f443c77","libcubeb/src/cubeb-coreaudio-rs/.gitignore":"9fe0b70e2daf21ec657a9abe5cf30d0cb91fb79eb84b1f205655f13aca9dbfac","libcubeb/src/cubeb-coreaudio-rs/.travis.yml":"dc07bac53f70f16c9bdf52264bdc58500ae6018c1b4c567bc7642f6b4ca3cc35","libcubeb/src/cubeb-coreaudio-rs/Cargo.lock":"422a0fa0cbefa12940bfaed0dd17548ee1462348c12b0e8b2c907c230a736486","libcubeb/src/cubeb-coreaudio-rs/Cargo.toml.in":"87a351640edc60ef0ce84868defa78c2527237ee1cc49c5e90c55c808a483f54","libcubeb/src/cubeb-coreaudio-rs/LICENSE":"6e6f56aff5bbf3cbc60747e152fb1a719bd0716aaf6d711c554f57d92e96297c","libcubeb/src/cubeb-coreaudio-rs/README.md":"0007782a05a5330f739ad789c19c82562c82e32386b0447000fc72c0d48405bc","libcubeb/src/cubeb-coreaudio-rs/build-audiounit-rust-in-cubeb.sh":"d228a05985dcd02ec1ecac66a2b64dae5a530804a25a7054ccc95905aedfb7ef","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/Cargo.lock":"5c95f50ac83e532b19d99c64eb5def6c508000d028e33a40d8b0bec653bea0e3","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/Cargo.toml.in":"9d8afec2aa957db8c47ca09340a47e5d9913549bdc226fb5fe88f7f707b0e22e","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/aggregate_device.rs":"7d2bd5f5fd7f3d008ebb69ad81f522ca0cb73db6d7b3e50ed1a63ea26ff721f4","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/audio_device_extensions.rs":"1b49e566d87bcd0b33e9402fb52f407f5b78902657c6c322b6964600eae24cc9","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/audio_object.rs":"cb527a92a3ee291cad55a6e44411d133e7e815e6904f9829f294b1234ef438c4","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/audio_unit.rs":"fe4198926bed493abe85c99ce31028520d7c768a4095cd3495817739330afa33","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/cf_mutable_dict.rs":"fc42edd270c6dfb02f123214d2d8e487bbd62b5bd923b71eec13190fd0104d2a","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/dispatch.rs":"1da419c7b79dd62544dd2a985350a6fde4ab0b4f92567b77b18ea493410fcbc6","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/lib.rs":"c93ed1411dd6cc39db44f57e0d7683bbc54745f84a3c9f9533a088895ec97abe","libcubeb/src/cubeb-coreaudio-rs/coreaudio-sys-utils/src/string.rs":"1ada92eef1c7f4e77495e21ee1efb0c9f90fb395a886f3687159b12a88a9f4d4","libcubeb/src/cubeb-coreaudio-rs/install_git_hook.sh":"d38c8e51e636f6b90b489621ac34ccd1d1b1f40dccce3d178ed1da1c5068f16d","libcubeb/src/cubeb-coreaudio-rs/install_rustfmt_clippy.sh":"4ae90d8dcb9757cb3ae4ae142ef80e5377c0dde61c63f4a3c32418646e80ca7b","libcubeb/src/cubeb-coreaudio-rs/run_device_tests.sh":"01f4c965443e0cd2d8a55df3a41fcc38aede5c8a0081ddf3101507a68a05dca5","libcubeb/src/cubeb-coreaudio-rs/run_sanitizers.sh":"84e93a0da137803018f37403511e8c92760be730426bf6cea34419d93d1a7ff8","libcubeb/src/cubeb-coreaudio-rs/run_tests.sh":"42444e9003905a44add6b7c165dbf87c2dbee290a964651fcf362ae9d894cf90","libcubeb/src/cubeb-coreaudio-rs/src/backend/aggregate_device.rs":"37a8f19af165a4413c512669ea4538b20adb128de0a490a13d5f54c2558c8327","libcubeb/src/cubeb-coreaudio-rs/src/backend/auto_release.rs":"050fdcee74cf46b9a8a85a877e166d72a853d33220f59cf734cbb6ea09daa441","libcubeb/src/cubeb-coreaudio-rs/src/backend/buffer_manager.rs":"0d1f9af94271ed4042e8cf0bb9658604c9f2e1ff9d931f50c1904d5ee372cb72","libcubeb/src/cubeb-coreaudio-rs/src/backend/device_property.rs":"4afd8961b4f722791f5c35a0934352a0a452f9d610e49c53820492788c9a77c1","libcubeb/src/cubeb-coreaudio-rs/src/backend/intern.rs":"11ca424e4eb77f8eb9fd5a6717d1e791facf9743156a8534f0016fcf64d57b0f","libcubeb/src/cubeb-coreaudio-rs/src/backend/mixer.rs":"c4d09291598cbffb2217b551770ec590f34b6dd6b461dd99b019d5bb70f0eef3","libcubeb/src/cubeb-coreaudio-rs/src/backend/mod.rs":"fe60523a82b31df4db41f1fc5fdd33464f3fea224e8b8974f3890cec26c225a4","libcubeb/src/cubeb-coreaudio-rs/src/backend/resampler.rs":"48bf8f56ae8d60dbabca6417b768000619abee8731ac3902164b45651ac08a4d","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/aggregate_device.rs":"22c28c48fc5f5aa760858ebe7311bdbcf07569a11d687590eb05002d97d70204","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/api.rs":"fd9eec01014e7f42e2c86ec098fe025f9f9cd9a8caff3abfc46559ddf96b6168","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/backlog.rs":"3b189a7e036543c467cc242af0ed3332721179ee2b1c8847a6db563546f1ac52","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/device_change.rs":"e09e75a5e654b1ac8359d086e6d28002fa4519debbedb8e1e7d091eba50e33f9","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/device_property.rs":"3a25dc22ef3e3dfee884538ad1be5a5789540a10da3915850b41680a0a3b1f07","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/interfaces.rs":"caa4383895aba2570d260432aa37018d8ddd6e3dca896b607bc27f82d91fc19d","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/manual.rs":"f5c3b54aea2af17f0f74fdd730852bf49bfeba8acd86fac3c69779a10b87a015","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/mod.rs":"8dba770023d7f9c4228f0e11915347f0e07da5fd818e3ee4478c4b197af9aa2a","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/parallel.rs":"a7ebd579339c40ca64c0757cc9da6baec641e670f226e1b2ec5049894700bd7a","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/tone.rs":"b028c67777b6453a26190b6a49785dfe28556adcbe179cb10862ce0d47ee8509","libcubeb/src/cubeb-coreaudio-rs/src/backend/tests/utils.rs":"33568e881e9e944949a2d58ebbb18b1e5e23dc097cbf7706fa2dd60d7730c500","libcubeb/src/cubeb-coreaudio-rs/src/backend/utils.rs":"6c3ffbcd602e6cc9f56deb9ecb07b2eef2e6f074ef924178e466f380aae5c595","libcubeb/src/cubeb-coreaudio-rs/src/capi.rs":"21b66b70545bf04ec719928004d1d9adb45b24ced51288f5b2993d79aaf78f5f","libcubeb/src/cubeb-coreaudio-rs/src/lib.rs":"a2c8a665cae5e26e6eee4c93b480f7ed708eeb6ba9ccf6f82b41c262f4b60015","libcubeb/src/cubeb-coreaudio-rs/todo.md":"efc1f012eb9a331a040cad4ac03aa79307f25885f71b6fb38f3ad7af8d7d515c","libcubeb/src/cubeb-internal.h":"50d2c0be2945136ff66666dbd8fcedc338f8f1d66eb2d9b09e09399193683ae8","libcubeb/src/cubeb-jni-instances.h":"8195554372bf60dea569873c9e5fb1106a2cf5dedc66a13d2bc967da0ff48a12","libcubeb/src/cubeb-jni.cpp":"cee58136cde7ef82045b59eee032e6eaf9bb677db12e053d8805ad9d67ee304e","libcubeb/src/cubeb-jni.h":"8f95cb6bc410bb62adae84f5e9d28fb8b57610107ed66941db0b4e4124548a72","libcubeb/src/cubeb-pulse-rs/.editorconfig":"bf047bd1da10cabb99eea666d1e57c321eba4716dccb3e4ed0e2c5fe3ca53858","libcubeb/src/cubeb-pulse-rs/.github/workflows/build.yml":"c91e5b2eeb7a70d9a03164c47e7e143a6eecb0f2b8cca65ae7c9a045e04f5933","libcubeb/src/cubeb-pulse-rs/.gitignore":"c97ecfda4d205190b973232dcfdb0c29748521c2534dd866bcc782f30b086738","libcubeb/src/cubeb-pulse-rs/AUTHORS":"0e0ac930a68ce2f6b876126b195add177f0d3886facb9260f4d9b69f1988f0cc","libcubeb/src/cubeb-pulse-rs/Cargo.lock":"35b7a4cfdc483e44bff4ada19c1afa44beac1904d19bab7ddc64a94adb257aab","libcubeb/src/cubeb-pulse-rs/Cargo.toml.in":"bac38dfc218f8eb3d11aefa4ab4ec598751385e95d5f54716becf587257c88a9","libcubeb/src/cubeb-pulse-rs/LICENSE":"44c6b5ae5ec3fe2fbc608b00e6f4896f4d2d5c7e525fcbaa3eaa3cf2f3d5a983","libcubeb/src/cubeb-pulse-rs/README.md":"0079450bb4b013bac065ed1750851e461a3710ebad1f323817da1cb82db0bc4f","libcubeb/src/cubeb-pulse-rs/pulse-ffi/Cargo.toml.in":"86bb1c8ebc438416c3a1f71b41494f19a85f698860b8c12d4875c8247f9c3664","libcubeb/src/cubeb-pulse-rs/pulse-ffi/src/ffi_funcs.rs":"a16646c5e7c49e94b907a7a404cfcadf3007688005c689cca936f0c2ee2e28e6","libcubeb/src/cubeb-pulse-rs/pulse-ffi/src/ffi_types.rs":"2ca56bc3638a40d331e53117a5dd175d0a6e102b1e0eccb9c2adc565c6861a33","libcubeb/src/cubeb-pulse-rs/pulse-ffi/src/lib.rs":"6aff308de11954a067d0f6ef95bf3126aabb6d928a5191e91d9a38ebadba91c2","libcubeb/src/cubeb-pulse-rs/pulse-rs/Cargo.toml.in":"16016702e7ceebb068a6222f4ba42978f5c570a1dbaf7dc159aada8fd4e9d3d8","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/context.rs":"49893b6b5190f228797b8d8c1b23830a8627176e6d73a1d856f5139ebb09774b","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/error.rs":"cbbdbae9aa614743a9dd70ac304605f24ad0256a640982dd4217b1894aa96b8d","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/lib.rs":"1fd45911e927782381dff20a848609cf6b777edd6b8e9321bcb31fc25a88e84d","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/mainloop_api.rs":"e1ed99071fb106d997df1f2889c49d967f51c9e290be023619ce7ab6795b2feb","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/operation.rs":"ae0a57a654d5d6d98e68036cea179322e936ee8e7878a9cc006471b9517e703d","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/proplist.rs":"47fc0b327db76a4e76f4c3bce28c522ef358cf0df273ffb62389939cc5ab1429","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/stream.rs":"2e93f480a3ba115a942182bfb06d2a01249d9ecb924f4c61545790fc02d99fa0","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/threaded_mainloop.rs":"2399e67a1c0c5fb0793e36c7a03edce58bffccb54fbf8a1c36bdd60c8fe364bf","libcubeb/src/cubeb-pulse-rs/pulse-rs/src/util.rs":"5e6179f397604520bb3fad6899c9aebf1605802dee008f1e1ccab55be74705dd","libcubeb/src/cubeb-pulse-rs/src/backend/context.rs":"e8d10bfc619738c34ebea18a06b23ffc7ab4a4f18f079b5535f50316648ab567","libcubeb/src/cubeb-pulse-rs/src/backend/cork_state.rs":"4a0f1afc7d9f333dac89218cc56d7d32fbffb487cd48c1c9a4e03d79cb3b5e28","libcubeb/src/cubeb-pulse-rs/src/backend/intern.rs":"11ca424e4eb77f8eb9fd5a6717d1e791facf9743156a8534f0016fcf64d57b0f","libcubeb/src/cubeb-pulse-rs/src/backend/mod.rs":"dfb30ec497d6215e4535e936fea8fe3a407ef24dc1cec43b52c0ffa923d9229c","libcubeb/src/cubeb-pulse-rs/src/backend/stream.rs":"8cc1afdbe9187d33a944c2289c18d83698db37549c0a03f7c198b817c662d8c5","libcubeb/src/cubeb-pulse-rs/src/capi.rs":"fa0fa020f0d0efe55aa0fc3596405e8407bbe2cbe6c7a558345304e6da87994e","libcubeb/src/cubeb-pulse-rs/src/lib.rs":"b41bbdc562cbfb130ed7c1e53fe69944774f515705341d8ce48a2f82c8c0c2c5","libcubeb/src/cubeb-speex-resampler.h":"dbf543eee4cc6e40ba3531a39d327e2cec884c19e26c570aa7eae0647e5f7420","libcubeb/src/cubeb.c":"01bde1830c8957e88eaf824c0fe2d65cf2e691ad9dde9f65aee558ef7bcc5852","libcubeb/src/cubeb_aaudio.cpp":"a7cf6835fc0b4d5c301f06b0271da5a03037082b78bbb924339560d389011954","libcubeb/src/cubeb_alsa.c":"0f061750afa89f0054a4655bbb23dd35f77124c53a90fcce1eccdb32e23937a9","libcubeb/src/cubeb_android.h":"396922d2bb994c39acb745f7449a78e8dee00ad5146583f647545a3e0a9dd010","libcubeb/src/cubeb_array_queue.h":"86ab9c32eef5f4427413091d5932843ee870144475cddb1f0e18cd39d49f6115","libcubeb/src/cubeb_assert.h":"07841be6cca09999a913d0c1e61ab0a5de02200efed5b66fbf7c481b1d0489b0","libcubeb/src/cubeb_audio_dump.cpp":"28f8b302a786fad6221d97ad4c06f6317657881f2521b67a490f28596efe3442","libcubeb/src/cubeb_audio_dump.h":"93da746cff7326ce904bd2ef1aef400d8fd36e8ab2fceb372d459127003a5dae","libcubeb/src/cubeb_audiotrack.c":"18382213f4b3a9808f3dd6b8c18173d21c7230718ecb3771762850ce6420e602","libcubeb/src/cubeb_audiounit.cpp":"4285a1ec1bb65e502443b82e1f988ed7af9eb2957c985fe2168574e17ffe8b06","libcubeb/src/cubeb_jack.cpp":"9493ca3f274cd9a5dba4b5023783747bf186c4fed0dc14ff34f841dc94c988ee","libcubeb/src/cubeb_kai.c":"3b6d52e4b0eaf2db34bcf902baf4784f72805bfb6349ebe769764d09195186c5","libcubeb/src/cubeb_log.cpp":"387f3f8989b260a1ca6067c25a0fd868e38c3d5bb81263924fad5341415a96fe","libcubeb/src/cubeb_log.h":"8511c7640f2856d107900f6c40775c5dfe711187204fb5b2557562b1a855399f","libcubeb/src/cubeb_mixer.cpp":"6779938a7fd70b0ad23fdf1194dab27b57e9afb8f03ff45885601796f76a1dfe","libcubeb/src/cubeb_mixer.h":"64425dcefad3632acf68d6ae9fbdf59ff7b7b0e92487c34d18cd67f52431dc23","libcubeb/src/cubeb_opensl.cpp":"617ba1316e4a31cafb08d9c26e3c6c66690563741748b6131a22b5e02d170e3b","libcubeb/src/cubeb_oss.c":"743dfe68354963e4a8553eb57fe36af6a639a7769da0b767afda5294edf865b9","libcubeb/src/cubeb_osx_run_loop.cpp":"e5c9ef5591eced85310af94575f84ea5d3051c7aaef4e41cfd221f8f8b7c4331","libcubeb/src/cubeb_osx_run_loop.h":"aa10dd0d6111973b37488d83403d204ecf6001a3530aac6bffab00c6bb31df15","libcubeb/src/cubeb_pulse.c":"034b4ad4eb072573ff2b97ed33c53622be4ff12523fb21d470d6106ca520a5e7","libcubeb/src/cubeb_resampler.cpp":"8d05ffd13a273300e5faa28d2306d14cad14e5192f1ceb4eed020fd272c85355","libcubeb/src/cubeb_resampler.h":"9e768ae9045de82cf2cdd8d1c6f5f20020c5a83ef06a0e7fc4f372e280e5a739","libcubeb/src/cubeb_resampler_internal.h":"7422c8d06cb2da8439568d7c37a98eae725e190ba428eff3763cf696584dd16b","libcubeb/src/cubeb_ring_array.h":"cd5b7d807c229e925fe61416d70b6ecfe41c735c361bfc01593ed10a6dad5849","libcubeb/src/cubeb_ringbuffer.h":"8f5dc7a58d8b7ad265ff3bbcac80ae160ff22243d869a5b502bf413fa58fd9b0","libcubeb/src/cubeb_sndio.c":"07b47b0993c4c37f45cef8df08bc555d7915354792edf4ee57b3e026ccf23a14","libcubeb/src/cubeb_strings.c":"6004618393cf4dc3e06cd4f44cb53589459dad21384de3695f8b3d16774edf26","libcubeb/src/cubeb_strings.h":"312f5c2230d9a02e369be1d991ec44a1793373046f208529b3cc54cb9a5b0610","libcubeb/src/cubeb_sun.c":"c9aaf34c2163dde73be4c98a4cf1059c00ca66954a78a9680384c9cb5a8927ed","libcubeb/src/cubeb_tracing.h":"def71a9c9659383ea3cf7e12ff0ba2f2c51a0ead03fef6d418eafde6e70c8f39","libcubeb/src/cubeb_triple_buffer.h":"f1d9b68a83c2463af6bce4e475f3a638705241cce920dceaeefb6b864f44f62d","libcubeb/src/cubeb_utils.cpp":"8f41899df2f5f82541f816dadcee3d18baab7a1aecf2bc6d0b382567209351aa","libcubeb/src/cubeb_utils.h":"7a3b1e2a97752e96ff11badc19149e1582d4289e4e200817a9ed3f905bf8ab10","libcubeb/src/cubeb_utils_unix.h":"2e67e39daed8ec17092a2d1a9b660a3d4e153fc351698d9e1f3d51ef974979c5","libcubeb/src/cubeb_utils_win.h":"4d7a397f475e08dd7af47fdc4003e9f78cf9058e095348eeb554135ea3c3c454","libcubeb/src/cubeb_wasapi.cpp":"e249d54458a5af823f88c0ee35950991494dac3f736ec847143462a8acbc002e","libcubeb/src/cubeb_winmm.c":"089987489bea20690e825b3107e31446b89270f316fa8219b2c501941c3bc98d","libcubeb/subprojects/speex/arch.h":"2300bce68c588270cdc684dc7f01377e5e251529f4545d93771e111c56d51b0f","libcubeb/subprojects/speex/fixed_generic.h":"306ee7453677fa6067f16c79d358c6c90a9d3d008850b493cdaa59c07e6375c1","libcubeb/subprojects/speex/resample.c":"9c3a1c64ecf3750af82c980d01ea73d3682f73c332a580465d1e787e5c54cd00","libcubeb/subprojects/speex/resample_neon.h":"7d3fd7af9a1ddde22518b9c7b4419073b72b2dfa5be4c3bc8796992bc87b3da0","libcubeb/subprojects/speex/resample_sse.h":"5a196d8e2d8ab5c956f5252f09f5ddc55aee1f99b1341af3fa54a1f4c2157924","libcubeb/subprojects/speex/speex_config_types.h":"24e3ffbf29e5519611a48e5acb959645b01d166dcb4369380d5f776c3f53d4cd","libcubeb/subprojects/speex/speex_resampler.h":"7e439ec0dd30c32216b3ced17135f8992e5aaf53389d3f5996a7d900c453e65f","libcubeb/subprojects/speex/stack_alloc.h":"e8a2fc0874942d2c7177475fcc141fdd0c0156200b8a4e7656d4a20313e2e569","libcubeb/test/README.md":"1c11b038f87daf10ea78abc17bdbdd157940c241df548c24d5872d142a98c1af","libcubeb/test/common.h":"9ef928375c3cea4345f09e8f75678f35a8866a10a29fb7d93cf02259653cdd97","libcubeb/test/test_audio.cpp":"cf094d11993c9d7602cc0a7f2dcf92d47ffd6142fdd5813c3010143fa08db080","libcubeb/test/test_audio_dump.cpp":"5716fd3ea828a26dd80252cafa2334404003639663334b9a96c87df2831b5553","libcubeb/test/test_callback_ret.cpp":"4f004b79476c44e059136478e2368c030920c9137180637e548eb2e6db7e5f6e","libcubeb/test/test_device_changed_callback.cpp":"9e02dd526602d7abfc5485c80c8b86ffa27c0a8c87e587a850f77eff9bfd14aa","libcubeb/test/test_devices.cpp":"1ea25e6ae19940d224011cd8c255d1038a858d1d9be0e7c32ea0455a0e8163f9","libcubeb/test/test_duplex.cpp":"2297abf827e21fe8695cae63c7e8076bc59e6ab4350aa8dbbd821e0f079732c4","libcubeb/test/test_latency.cpp":"a1d75355e49895ea105eb814d20c6e1a37e8cf98be01f73832f4768eb7e1176f","libcubeb/test/test_logging.cpp":"72522cf7794212dceb2f26a98f5c9297a6366f2eab90128066f59422a6edb7c5","libcubeb/test/test_loopback.cpp":"92dbdebd71aa2e844694100818ac11e5145bccb01aa3e6d7ce3bc990931dda3d","libcubeb/test/test_overload_callback.cpp":"593c36fc78ea2fccd4dc2b6e565cb3bf53503f402522737e9005d9eab7fc4732","libcubeb/test/test_record.cpp":"90484423d4e5c4ffb8e6f65c9bae1f7384cac7eeeb4f42c0fcca768ee0e5c8e6","libcubeb/test/test_resampler.cpp":"57d6c0754a13ba6062868029b3daf59db591c69d1d0c8662c5d750a2a031f63f","libcubeb/test/test_ring_array.cpp":"c0420d04c914b0f61bdc81b9c4511c1b535518b2f87f32a5539f9ca6310dd5b1","libcubeb/test/test_ring_buffer.cpp":"cf247fda806f976d2b8dd2790e5a25bda68943423d7b0bcd4ac69a57f94e2f88","libcubeb/test/test_sanity.cpp":"b1b474be02e90fa310c265d4abdc712e5637bc5420c670f26d79be98b092804f","libcubeb/test/test_tone.cpp":"75e32348aa18583130bc3f2849862a4153729f19f7e5b1bcc9e91cc6ab7bcbe7","libcubeb/test/test_triple_buffer.cpp":"b1024e57581ec066d81e2a4749c71a8392ec81fa9a22e0e0c1d124f7ca86427d","libcubeb/test/test_utils.cpp":"ec18e3c14519d053cfd544ae59b2ba39716500cd7da72b5b50366eefff0a0481","libcubeb/tools/cubeb-test.cpp":"e1a29a10ba824a49dad4d0d6c9f495786148f0dc942558ae990786dba6065f4e","src/audio_dump.rs":"2491741d58a609e93de1a46d003fd4e26e4cd88cd89d4c9584635141964e0274","src/callbacks.rs":"a83d9a16ee66b3cd7100dd06e1f409698a727d642df0dfa797c067b5cf1def66","src/channel.rs":"02fd91384195180a56663aba87f00660c20e71fe7654c7b68d8f470173f40d5f","src/context.rs":"23b9326f58494b0860d080ec5f0e76be2325172da7f0274ebba152dc35182f3b","src/device.rs":"bd20afac637ea964df950ae6df30ddbc9ea7a865c7b471ba4c58d632b8f72708","src/error.rs":"406e3b843ed2d263fe677c4b34fb96a6d780a68bcb56a6f85f041d20d70227bd","src/format.rs":"d4d27790c20eab0b16592f60d5e487425a45a268cf4c74cf843c10ac91bbff4c","src/internal.rs":"c3af5f53dc7957860bf3bc0cd9737d094fb8ac000e7b40c569304cfa76a43145","src/lib.rs":"0fa0602859889c4f608ca4178c45f43d7e4b258ea0185a64341fab4532ebcd0e","src/log.rs":"8ac402b6c4d20db651cbddb87b27b3aa5ab0c3c50dac08a6c09fb1b7f9a3a391","src/macros.rs":"caef13f5d23f7a3ec1a54ec3ca2390ac4ad89d521893f1d0864daf70d57a20aa","src/mixer.rs":"e72e92855614da187da6419ed0a115062a05670cb73443b2ea4313d8f5108a68","src/resampler.rs":"b16bd6a4b1179b25f2a5391133fcd4410467e6a68c0a46cf15a12d280c1862e0","src/stream.rs":"e736794dea181be0cde83ff78079efa3bb1c64e38b8c57615590fa4c6aadf2ac"},"package":"cd2114801cd652119ace9e050a16d6641475fe3341ef45c58c9377fa45cbe3bf"} +diff --git comm/third_party/rust/glslopt/.cargo-checksum.json comm/third_party/rust/glslopt/.cargo-checksum.json +index e31d0acbebb..ae0d9751c95 100644 +--- comm/third_party/rust/glslopt/.cargo-checksum.json ++++ comm/third_party/rust/glslopt/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{".cargo_vcs_info.json":"7075d1c5c5e19288cefb431f16462eaa23229d02791120f4885ab1d20470cb7e",".gitmodules":"ffc0cce90e856d4f4bdb3bd3c950c9e59501a45ebd5022b91cfe8c07c79ef1ac","Cargo.lock":"f7970552595dc803ace9ef19b5f5d7b1fc784aac30cb27b2ebc3002d97122b9d","Cargo.toml":"7c53ee20d848f9913cacbfcb3ab2e89e30deee8d619d173c95130c7c5d065827","README.md":"4468e08c64c19977707d792bfab0080e35ff927b64990eab77873f8ba056ba1c","build.rs":"92e29699487c21389fc823c50b410cfbfc74cc774265d24958489909ee48a076","glsl-optimizer/.editorconfig":"dca7ff05a95f608849c4dc640af7f83a0f415618e327a2ecb6a0afa0d9d2bacb","glsl-optimizer/.gitignore":"8ba554a4ca510ea7d9684475aa043edbeba7d15a5c9c4a04d8b1379a04ec6270","glsl-optimizer/CMakeLists.txt":"42ce94744e82ffa000da8b64d81fc140e293b9f5da7dd4cf6b49e7404a2448d9","glsl-optimizer/README.md":"b18eef11a92d267d88a937b1154f7670ee433c730b102fdf7e2da0b02722b146","glsl-optimizer/contrib/glslopt/Main.cpp":"14ba213210c62e234b8d9b0052105fed28eedd83d535ebe85acc10bda7322dd4","glsl-optimizer/contrib/glslopt/Readme":"65d2a6f1aa1dc61e903e090cdade027abad33e02e7c9c81e07dc80508acadec4","glsl-optimizer/generateParsers.sh":"878a97db5d3b69eb3b4c3a95780763b373cfcc0c02e0b28894f162dbbd1b8848","glsl-optimizer/include/GL/gl.h":"1989b51365b6d7d0c48ff6e8b181ef75e2cdf71bfb1626b1cc4362e2f54854a3","glsl-optimizer/include/GL/glext.h":"2ac3681045a35a2194a81a960cad395c04bef1c8a20ef46b799fb24af3ec5f70","glsl-optimizer/include/KHR/khrplatform.h":"1448141a0c054d7f46edfb63f4fe6c203acf9591974049481c32442fb03fd6ed","glsl-optimizer/include/c11/.editorconfig":"f96a2354e5f2b90367d643e6d9e980ce76278d4d47afd8b2713b595753aa8b4b","glsl-optimizer/include/c11/threads.h":"56e9e592b28df19f0db432125223cb3eb5c0c1f960c22db96a15692e14776337","glsl-optimizer/include/c11/threads_posix.h":"f8ad2b69fa472e332b50572c1b2dcc1c8a0fa783a1199aad245398d3df421b4b","glsl-optimizer/include/c11/threads_win32.h":"95bf19d7fc14d328a016889afd583e4c49c050a93bcfb114bd2e9130a4532488","glsl-optimizer/include/c11_compat.h":"103fedb48f658d36cb416c9c9e5ea4d70dff181aab551fcb1028107d098ffa3e","glsl-optimizer/include/c99_compat.h":"aafad02f1ea90a7857636913ea21617a0fcd6197256dcfc6dd97bb3410ba892e","glsl-optimizer/include/no_extern_c.h":"40069dbb6dd2843658d442f926e609c7799b9c296046a90b62b570774fd618f5","glsl-optimizer/license.txt":"e26a745226f4a46b3ca00ffbe8be18507362189a2863d04b4f563ba176a9a836","glsl-optimizer/src/compiler/builtin_type_macros.h":"5b4fc4d4da7b07f997b6eb569e37db79fa0735286575ef1fab08d419e76776ff","glsl-optimizer/src/compiler/glsl/README":"e7d408b621c1b605857c4cab63902f615edb06b530142b91ac040808df6e22f7","glsl-optimizer/src/compiler/glsl/TODO":"dd3b7a098e6f9c85ca8c99ce6dea49d65bb75d4cea243b917f29e4ad2c974603","glsl-optimizer/src/compiler/glsl/ast.h":"3e68ff374350c49211a9931f7f55a485d8d89fc4b21caaffbf6655009ad95bf8","glsl-optimizer/src/compiler/glsl/ast_array_index.cpp":"92b4d501f33e0544c00d14e4f8837753afd916c2b42e076ccc95c9e8fc37ba94","glsl-optimizer/src/compiler/glsl/ast_expr.cpp":"afd712a7b1beb2b633888f4a0911b0a8e4ae5eb5ab9c1e3f247d518cdaaa56d6","glsl-optimizer/src/compiler/glsl/ast_function.cpp":"74f4fbd490e366b37f4715168bb3465ecd9334d4130942f75dcc8e80e8e7f027","glsl-optimizer/src/compiler/glsl/ast_to_hir.cpp":"d0f798eb09271d41d068b9e7b18220d37f1ed0083300ab51eba30989698fe23d","glsl-optimizer/src/compiler/glsl/ast_type.cpp":"8eb790b24b26dfb72bdc333744b566c26d8464c5d47d20eae659461f5c4899f7","glsl-optimizer/src/compiler/glsl/builtin_functions.cpp":"454189d643c220fcb49116ee5c8a34f7b349aa67564040deb8607f6a41a15e70","glsl-optimizer/src/compiler/glsl/builtin_functions.h":"a37cad7ed09b522c5b8bec7b80115a36846e7ba6e0874a2a858e32f7f202c665","glsl-optimizer/src/compiler/glsl/builtin_int64.h":"619def6f3aebf180da3944ef08f159ab12a58b24767e41d8b985ac37ded54d62","glsl-optimizer/src/compiler/glsl/builtin_types.cpp":"afec060b62d6f3b00bfbf94e9fa5f96341ce096c128d1eef322791e6ed9cea4d","glsl-optimizer/src/compiler/glsl/builtin_variables.cpp":"6563bfb1345cbca4c77e00eef09ad152f3e1dc271d246a08c5ce9e1f4ce4250a","glsl-optimizer/src/compiler/glsl/float64.glsl":"1072fd888be48c2a7a5117cd2d92a65f034965a66375f598bb856bff5d7be766","glsl-optimizer/src/compiler/glsl/generate_ir.cpp":"e5f0175370a0d07f93c48d3f0f1b8233d12c64a7b02de02dcc753ef7b398ef0f","glsl-optimizer/src/compiler/glsl/glcpp/README":"a0332a1b221d047e9cce5181a64d4ac4056046fd878360ec8ae3a7b1e062bcff","glsl-optimizer/src/compiler/glsl/glcpp/glcpp-lex.c":"2d179879b1ffe84f58875eee5b0c19b6bae9c973b0c48e6bcd99978f2f501c80","glsl-optimizer/src/compiler/glsl/glcpp/glcpp-lex.l":"e4c5744c837200dafd7c15a912d13f650308ea552454d4fa67271bc0a5bde118","glsl-optimizer/src/compiler/glsl/glcpp/glcpp-parse.c":"03494f9ce1cb82260506e2559e73a3eeb622c4bd51b65eaa0a2c3351862bd4c8","glsl-optimizer/src/compiler/glsl/glcpp/glcpp-parse.h":"264d9a18421cde255ce34a0a62b3d8e73465359f0d167e64aa3973062aae5bdd","glsl-optimizer/src/compiler/glsl/glcpp/glcpp-parse.y":"fafb66e3a8f149d19e085f18a4273ba6d4c11af9e9a01d665cc784dddf97b79f","glsl-optimizer/src/compiler/glsl/glcpp/glcpp.c":"37ed294403c2abfd17fd999d1ae8d11b170e5e9c878979fefac74a31195c96b0","glsl-optimizer/src/compiler/glsl/glcpp/glcpp.h":"85ac8b444bcbd0822b66448a1da407b6ae5467b649f5afaf5c58325bd7569468","glsl-optimizer/src/compiler/glsl/glcpp/pp.c":"a52d94f1bcb3fb2747a95709c4a77c25de7eea8354d2b83bb18efd96976a4473","glsl-optimizer/src/compiler/glsl/glcpp/pp_standalone_scaffolding.c":"d11aeb3acfe966d1b78f1ee49804093f2434214c41391d139ffcb67b69dc9862","glsl-optimizer/src/compiler/glsl/glcpp/pp_standalone_scaffolding.h":"abbf1f36ec5a92d035bfbb841b9452287d147616e56373cdbee1c0e55af46406","glsl-optimizer/src/compiler/glsl/glsl_lexer.cpp":"272b9fc1383d72b81bfc03fa11fdf82270ed91a294e523f9ce2b4554bd3effa9","glsl-optimizer/src/compiler/glsl/glsl_lexer.ll":"2b57d9f9eb830c3d7961d4533048a158ee6f458c8d05c65bea7b7cfbc36e4458","glsl-optimizer/src/compiler/glsl/glsl_optimizer.cpp":"f8095d20629d0af70be930b0612e169edb274551a1d25a3cd1bf9995a11ce2e8","glsl-optimizer/src/compiler/glsl/glsl_optimizer.h":"22e843b4ec53ba5f6cd85ca5f7bad33922dca8061b19fb512d46f1caca8d4757","glsl-optimizer/src/compiler/glsl/glsl_parser.cpp":"126baf368d525aba301854e3d91ba60b5aee32e1102376af71416f32cb95ec48","glsl-optimizer/src/compiler/glsl/glsl_parser.h":"2ea9a50716098a8f7bef782d2a030d757b68da73afb01b4d4940d3e8381d44e8","glsl-optimizer/src/compiler/glsl/glsl_parser.yy":"6b1fd1576b29fce005dff744a6dbd0219e4c695c361d61864e1f3a8d6fa6b764","glsl-optimizer/src/compiler/glsl/glsl_parser_extras.cpp":"aad64b5b66467da650091430681e8c6a820cf3cadc4db3c160bf2f15875390ae","glsl-optimizer/src/compiler/glsl/glsl_parser_extras.h":"71fd0e92bbdb193dfb067d7bfdb1200d77392be2fbd0cbfc9ca89d1bb4c7e741","glsl-optimizer/src/compiler/glsl/glsl_symbol_table.cpp":"6660fb83c0ddddbbd64581d46ccfdb9c84bfaa99d13348c289e6442ab00df046","glsl-optimizer/src/compiler/glsl/glsl_symbol_table.h":"24682b8304e0ea3f6318ddb8c859686bd1faee23cd0511d1760977ae975d41bf","glsl-optimizer/src/compiler/glsl/hir_field_selection.cpp":"72a039b0fcab4161788def9e4bedac7ac06a20d8e13146529c6d246bd5202afd","glsl-optimizer/src/compiler/glsl/int64.glsl":"303dbe95dde44b91aee3e38b115b92028400d6a92f9268975d607471984e13eb","glsl-optimizer/src/compiler/glsl/ir.cpp":"2b4741cce90b5d4abff5d719c7324e2693c67294d4d99736cb241554adb281bc","glsl-optimizer/src/compiler/glsl/ir.h":"990b1c74447c4eb4835353ccb0ed9aea644f97fc1129ef1739cd935075d85d2e","glsl-optimizer/src/compiler/glsl/ir_array_refcount.cpp":"8cdc1cffe01e42e0566fa2193a75f789628e8025ad1b82f0ee6f204451b7f9f7","glsl-optimizer/src/compiler/glsl/ir_array_refcount.h":"75f06ec81342b379096ca52e1dc0fd5f19a11ff8e9b58203c20628179d644c12","glsl-optimizer/src/compiler/glsl/ir_basic_block.cpp":"1e2920b1c0ecb08424c745c558f84d0d7e44b74585cf2cc2265dc4dfede3fa2f","glsl-optimizer/src/compiler/glsl/ir_basic_block.h":"81be7da0fc0ee547cd13ec60c1fcd7d3ce3d70d7e5e988f01a3b43a827acdf05","glsl-optimizer/src/compiler/glsl/ir_builder.cpp":"daba29c5a1efdd5a9754f420eb3e2ebdf73485273497f40d4863dadeddb23c0d","glsl-optimizer/src/compiler/glsl/ir_builder.h":"2822e74dd3f6e3df8b300af27d5b11ea2dd99d0e5e7ca809b7bbcce9833c483c","glsl-optimizer/src/compiler/glsl/ir_builder_print_visitor.cpp":"8c6df5abf2fe313363f285f171c19ca6c8ee4f3bc2ed79d33c0c88cc8be45c48","glsl-optimizer/src/compiler/glsl/ir_builder_print_visitor.h":"799852adc3a0e54d04080655e7cebfa0d3bf5b6ffed5d8414f141380665d4db7","glsl-optimizer/src/compiler/glsl/ir_clone.cpp":"d897a4e1f5bbec4a6a2f15044c1be9a4d13899c73be77335b041049a4589aa5d","glsl-optimizer/src/compiler/glsl/ir_constant_expression.cpp":"78bd87ddb09db67f6c499067728d72aef4f16aa02721a99a4b769d1e0cfa9010","glsl-optimizer/src/compiler/glsl/ir_equals.cpp":"bca28533a6310b0fc152b56d80872368f1510dc62ed6e8ac199b9ffa7fac02e7","glsl-optimizer/src/compiler/glsl/ir_expression_flattening.cpp":"7e918d4e1f237eca01396004015865ce345afe32a876c9dbc6728576a1a7eae4","glsl-optimizer/src/compiler/glsl/ir_expression_flattening.h":"f45b66aa9497520e7e08e612d24b308477c34477fbd963ee9320eac664957f16","glsl-optimizer/src/compiler/glsl/ir_expression_operation.h":"cc9f10727dbd26cac506804f51456302c702650f9eeb59054a7e1575d5cf6687","glsl-optimizer/src/compiler/glsl/ir_expression_operation.py":"7b86c96021b9fbe165957f4ecb0b612fefcde1c2cf3c6d75e3cdb22e369216ba","glsl-optimizer/src/compiler/glsl/ir_expression_operation_constant.h":"9ad3346416392e3efa11e12ecf2feca7453c5253d241eb96c91dfb85d4f2b971","glsl-optimizer/src/compiler/glsl/ir_expression_operation_strings.h":"a6826daf496a8b9e89885bc2a161ac3445d501b23c6e0ac33e2c01b506b273c8","glsl-optimizer/src/compiler/glsl/ir_function.cpp":"7537365fc0fbe4b37a26b9a2146cc64d3e9a774d60eab63b65002ad165ae8fc7","glsl-optimizer/src/compiler/glsl/ir_function_can_inline.cpp":"faddbf112187a048d502716a3fb82570a322299ba2a3abd79388382c82040bfc","glsl-optimizer/src/compiler/glsl/ir_function_detect_recursion.cpp":"9176973eaf5c0a984701f953bb7a80f37dca43d59b5bce50fc69b3f02f2902d7","glsl-optimizer/src/compiler/glsl/ir_function_inlining.h":"9739493f99c489987d650762fccdd3fb3d432f6481d67f6c799176685bd59632","glsl-optimizer/src/compiler/glsl/ir_hierarchical_visitor.cpp":"3725861fbe2b98e0617f52d3b14cf6d3b25fb5ec00f5ef5d308b03642f592767","glsl-optimizer/src/compiler/glsl/ir_hierarchical_visitor.h":"e0560210e966c0c31e4ca843e80ea154e64db5a444b8c2df845b6ba5b3a43fc1","glsl-optimizer/src/compiler/glsl/ir_hv_accept.cpp":"caf7ce2cd9494aadd3c58bcf77f29de58368dc9e347a362bbf37f8bda9509b80","glsl-optimizer/src/compiler/glsl/ir_optimization.h":"8b3dcfc7f9e96b21a8dd47a0040d90be483a9e67a2cdce3a697188fb758d4630","glsl-optimizer/src/compiler/glsl/ir_print_glsl_visitor.cpp":"f8e34a983452be0dcb5a695e9c8e895eead24f9e540992a8afe510ae85da4c4c","glsl-optimizer/src/compiler/glsl/ir_print_glsl_visitor.h":"1ad1bd3efd1ace39051c13f904c05fd80425d329444f9a8d47fd6d948faf46e0","glsl-optimizer/src/compiler/glsl/ir_print_visitor.cpp":"643f5a68aae3fb37267fd793f1216d1cfdeb2c09338c26b1f30e4c6deaef4de5","glsl-optimizer/src/compiler/glsl/ir_print_visitor.h":"4573eb93268a2654c14b505253dd651e2695d43dc745904d824da18305269b95","glsl-optimizer/src/compiler/glsl/ir_reader.cpp":"06bfba802c8354e5a8b2334b6d78d6297de18235bedd3f8fbb382c89870b02f2","glsl-optimizer/src/compiler/glsl/ir_reader.h":"63e3f7f1597936a7011d5b520e171b197bf82bee6c1560d822c3edf5aaa6f9e9","glsl-optimizer/src/compiler/glsl/ir_rvalue_visitor.cpp":"84b5c5d746555adca85759c2912fe48010232b7c1c0bd2cf03bd04067a85e66f","glsl-optimizer/src/compiler/glsl/ir_rvalue_visitor.h":"fd8c561b71085d3211fff85ed514fecb299d8ce19a04bc063419a55b6d840525","glsl-optimizer/src/compiler/glsl/ir_set_program_inouts.cpp":"ab9f115ce9e7f312d9c7978340ced0dc4ae6d13a80e08442ba9709d11d50cae5","glsl-optimizer/src/compiler/glsl/ir_uniform.h":"683ae6896b1a08470c090be5f822fc31cd434eab9216e954b9bba24a46975109","glsl-optimizer/src/compiler/glsl/ir_unused_structs.cpp":"9c1620c45f2fc071fe5ed828472040b14c5f42effe06aa0e3b8352c95ef78786","glsl-optimizer/src/compiler/glsl/ir_unused_structs.h":"13387b49c23093575276b25b9dfd31fedd8f131c5c4f3128ab04cf03e15b5295","glsl-optimizer/src/compiler/glsl/ir_validate.cpp":"6b232be5999a86ea278f4f15b2832d76843246509118d924243055a3b9b0299f","glsl-optimizer/src/compiler/glsl/ir_variable_refcount.cpp":"2764a3cad937d53f36db7447c3a5b98b04bf153acf81074d971857fc5bca460d","glsl-optimizer/src/compiler/glsl/ir_variable_refcount.h":"b0668e3eb1501ef65e38fe12830742ecb3d28e6039f30e366c8924efc29b4a39","glsl-optimizer/src/compiler/glsl/ir_visitor.h":"f21b3534c3d66d5fb707d1581fece7e1eb043523afbaedf89918cfb031c6df94","glsl-optimizer/src/compiler/glsl/link_atomics.cpp":"360f0209e11f367ba358223597b0a118bae095bff16337cf03f1fb89c5b80ca6","glsl-optimizer/src/compiler/glsl/link_functions.cpp":"de7895da8aa33a1e3c2c1eb2fdaf267ab5d1fbfdb79ae2e67f95211e946e294c","glsl-optimizer/src/compiler/glsl/link_interface_blocks.cpp":"1926cfa73810704eb19b916c1b2cdb9321155e2f98b2a0a57c7c3c6e960540cd","glsl-optimizer/src/compiler/glsl/link_uniform_block_active_visitor.cpp":"1e14e06ca3b2c1089cfba2e8eaf0c1f373d9d6374b6082f320962dd71ae09611","glsl-optimizer/src/compiler/glsl/link_uniform_block_active_visitor.h":"fd58c155af645295bb6aec08797889de586f4d919731de2bce57e8dce59bb048","glsl-optimizer/src/compiler/glsl/link_uniform_blocks.cpp":"09589f49776dce32e6c4044937de7e0c839a9754ad31960148f8f9e010658997","glsl-optimizer/src/compiler/glsl/link_uniform_initializers.cpp":"bf98e08c12db466acf9623cbeb8fa8e3b4002512722e7a6521287f558a099f37","glsl-optimizer/src/compiler/glsl/link_uniforms.cpp":"84bad5b1377362cecf259b05124239be5220b03ce1c0c61b59bd9a47e4379af2","glsl-optimizer/src/compiler/glsl/link_varyings.cpp":"a5f1a53e7c80d635515fe808ff223d89fef1767abb0f2b7aa28fa6773dca353f","glsl-optimizer/src/compiler/glsl/link_varyings.h":"b9dbe018f038df69763df2e928742ce81bbc6e3aaba26f50621e30a6d9aa6220","glsl-optimizer/src/compiler/glsl/linker.cpp":"40b1ecd5d4f6c7f13d5a87ce390561a51fdf6f3fcd9b2197b9c88b03a773ba94","glsl-optimizer/src/compiler/glsl/linker.h":"ecf94b4ad75ef461c27c557fda4bd25f34c91930822b8e1d729ec84520d4a049","glsl-optimizer/src/compiler/glsl/linker_util.cpp":"1663ad88e2a369305659aeeffaedb5bd752cf76340a2ba5797fc0bf600633cf9","glsl-optimizer/src/compiler/glsl/linker_util.h":"6db788daf9c8e87ae2764b61a8b37ebe419e69c1b82ddee01986e37c978c6993","glsl-optimizer/src/compiler/glsl/list.h":"b1f46ce0e552fe7c45b2a19408a9d97662e23e4b182ab335491c26f8cf25886f","glsl-optimizer/src/compiler/glsl/loop_analysis.cpp":"57ecd573477c68091c7cc99537faa7139a8f395935e3d4f10144cefdefb5a611","glsl-optimizer/src/compiler/glsl/loop_analysis.h":"a85f045a038ee5b5176063e85d7988865862c44ab0580f771b993a042d0b69cc","glsl-optimizer/src/compiler/glsl/loop_unroll.cpp":"bd4292ea2809f5a669bcb76ceaa1ac365772dcd638c579c3ed10275214901a54","glsl-optimizer/src/compiler/glsl/lower_blend_equation_advanced.cpp":"8cfbef140d9c4b4d2f57bfa05c9c374d31a121d0f87afce94333f049023b654a","glsl-optimizer/src/compiler/glsl/lower_buffer_access.cpp":"1ae221c3c7a95aeb867207e7a742be635f91b406c157747bfd6ddf10274d97fb","glsl-optimizer/src/compiler/glsl/lower_buffer_access.h":"807886953a576a323591798cbca5e2df24295ea893b28affd8ffb5926cebaa04","glsl-optimizer/src/compiler/glsl/lower_builtins.cpp":"4d81afc32cf58e1481fcb5e42888ab93dbe6820310a20ff7a9982b77b2152d9b","glsl-optimizer/src/compiler/glsl/lower_const_arrays_to_uniforms.cpp":"608403f0eeeedf21cfcd3014116e0f44e28cbdf6c4c32aac7e613e64e30205e1","glsl-optimizer/src/compiler/glsl/lower_cs_derived.cpp":"179905cd47a294122adeb5b0abfed6f2f67782dcde21b544d1ee2c1985154e66","glsl-optimizer/src/compiler/glsl/lower_discard.cpp":"3b361b2db0004d544d64611cb50d5a6e364cf6c5f2e60c449085d7d753dd7fb0","glsl-optimizer/src/compiler/glsl/lower_discard_flow.cpp":"f5c29b6a27690bb5c91f196d1a1cf9f6be4f1025292311fe2dac561ce6774dee","glsl-optimizer/src/compiler/glsl/lower_distance.cpp":"a118c85493d5d22b2c059a930c51a5854896d4b1dade76598eaa985e5a3dff8c","glsl-optimizer/src/compiler/glsl/lower_if_to_cond_assign.cpp":"469e617757fd1728709cce021aac5c8da05ee503bf5366977bdc4ef7a6d83950","glsl-optimizer/src/compiler/glsl/lower_instructions.cpp":"6ff5c396abe40d8a2145d571e99e2bbe9143393e15aafc28adc2803a01d821b6","glsl-optimizer/src/compiler/glsl/lower_int64.cpp":"d1ed41196880dd53c7b13e2782f9423f8442bf1d46186e8be92b1b66218a83ee","glsl-optimizer/src/compiler/glsl/lower_jumps.cpp":"34de7b493f281589fb0c2c0f6e885d0a0fabbe7a4e97a73de374dd714777a58c","glsl-optimizer/src/compiler/glsl/lower_mat_op_to_vec.cpp":"dff7a308edc4846c348ed4225c6699a9c75abac68d88f41f85954276552779f4","glsl-optimizer/src/compiler/glsl/lower_named_interface_blocks.cpp":"16063ac127bff75a68272070ab11c21c25101edbff62b4c68f4983b4cd941af0","glsl-optimizer/src/compiler/glsl/lower_offset_array.cpp":"3b00773399135aea85746a5a68b96ef000bc6841be1a2c8e6f25c516628b0949","glsl-optimizer/src/compiler/glsl/lower_output_reads.cpp":"a0fc9975d5aa1617e21fc6c353659a9802da9e83779a3eef4ec584f74b4dadc5","glsl-optimizer/src/compiler/glsl/lower_packed_varyings.cpp":"7550099d4ae123d71541c2fc88bc04fbfe9271ec75d7e210987d1c8cac3cf3ea","glsl-optimizer/src/compiler/glsl/lower_packing_builtins.cpp":"79a13d161fe505a410ab948d92769395708693ec888153630fa240e5b97e356f","glsl-optimizer/src/compiler/glsl/lower_precision.cpp":"f82a185b879872b977a1787d8061b9a80bc4cf8db1b970db6efba2ad9cc20fa2","glsl-optimizer/src/compiler/glsl/lower_shared_reference.cpp":"ea2dccf50a83bc19391bf6b7ab6aa53c0005f427af4066d25140340af9a4beef","glsl-optimizer/src/compiler/glsl/lower_subroutine.cpp":"f69fa53650eeb6f2944fce4d36a6e0a423e6705f3a3bd3389c7fadb83cfc8802","glsl-optimizer/src/compiler/glsl/lower_tess_level.cpp":"b196c9d424c0569f3e85d75c2d125af21566cb113d69036db87c0990703e0fa7","glsl-optimizer/src/compiler/glsl/lower_texture_projection.cpp":"4d247f244272adc8250fd888d8d932a140dd5de4d1efc7a58492c3c2b8291527","glsl-optimizer/src/compiler/glsl/lower_ubo_reference.cpp":"89bdbc6c1669230c644c0857db1ce2781ec61d349ecd08c7914146e1f4750a4a","glsl-optimizer/src/compiler/glsl/lower_variable_index_to_cond_assign.cpp":"fce930f29ac9405b297d1f749d68f59506b89c70b4ee1b1ab8cf49a34cc71ecf","glsl-optimizer/src/compiler/glsl/lower_vec_index_to_cond_assign.cpp":"3c67d851a11a55fad1c49a550f3a0cfe50892d33a3f238ce266cd829eba510a8","glsl-optimizer/src/compiler/glsl/lower_vec_index_to_swizzle.cpp":"f5ec666b73e1415cbab32519a53605ed385f3b03e889560373dbce69dda5000e","glsl-optimizer/src/compiler/glsl/lower_vector.cpp":"f7c13f5572ebe09b6a71553133b2cf003cd4b77b9657600672ee3b21bf890725","glsl-optimizer/src/compiler/glsl/lower_vector_derefs.cpp":"b05793da6dd620a531b43df5af8b2ecbc37b9db0c88910f5724ea10bcd057e19","glsl-optimizer/src/compiler/glsl/lower_vector_insert.cpp":"fee772ec17eea5e86a529bf9c5fa2ee0d29a5982bb75ebc6d68ed36cd19aa299","glsl-optimizer/src/compiler/glsl/lower_vertex_id.cpp":"690e8715182e03fead5cc5a35251fb4f41b357e4c71a1dfbc4bd7be19862b56d","glsl-optimizer/src/compiler/glsl/lower_xfb_varying.cpp":"58c0e8b270e4bbde54250be03cdb2f36966bcafb785372ad2e2b786835df7f9f","glsl-optimizer/src/compiler/glsl/main.cpp":"ae5e88abbbc8a12f769e1296bad938b9d7398cc6da0d3d0caeceeeb876536850","glsl-optimizer/src/compiler/glsl/opt_add_neg_to_sub.h":"f5054944bfd068810629080d0ea11df78b3f57a8f86df75e13ca50157ad1964d","glsl-optimizer/src/compiler/glsl/opt_algebraic.cpp":"25f45b20e1972ee8c789177a1aeda6e4286c25db2eae3a43ff83029ae64969c0","glsl-optimizer/src/compiler/glsl/opt_array_splitting.cpp":"19d3ce0e815438f4df9ab2890e767b03a4f3f191b53bb30c0217cf2ae6a95430","glsl-optimizer/src/compiler/glsl/opt_conditional_discard.cpp":"0e44e0e126711a3725c1f3a2aa65ff03c381fed08680ffc30101aae60f716c4e","glsl-optimizer/src/compiler/glsl/opt_constant_folding.cpp":"a088d04d9b45f9e55e235835648f614c89b7803c03a6d4f6a6d1a6bc1f0228bd","glsl-optimizer/src/compiler/glsl/opt_constant_propagation.cpp":"8a9440d77ecd6dcf13e683cbb99943aab6311c8fd4b5f6a9189a8d4f270746f4","glsl-optimizer/src/compiler/glsl/opt_constant_variable.cpp":"63d3ccd4dd09f19c9cf1a2f51592111bed41284504f29f3c0de4cadebc439a37","glsl-optimizer/src/compiler/glsl/opt_copy_propagation_elements.cpp":"ffa0f50863995e0d2e31f55a52e82319edc71e520987bebd7f7e561ea331c64b","glsl-optimizer/src/compiler/glsl/opt_dead_builtin_variables.cpp":"84e8747b948232f01dd56b428b9315f96f9511f605f240119fc446fae28981a9","glsl-optimizer/src/compiler/glsl/opt_dead_builtin_varyings.cpp":"761523e88f5b3ba785170f4d7205e94fa99acb7e74d29efbe40e1c010e1dbdb3","glsl-optimizer/src/compiler/glsl/opt_dead_code.cpp":"fd1ba2da7337d4e5dad17f5c2d73d9cc8880305f423e85d64cf94553588fa401","glsl-optimizer/src/compiler/glsl/opt_dead_code_local.cpp":"969a598b4df322baf222258a66cd64a326ea20e5b3125be9d8d1771f522c69e0","glsl-optimizer/src/compiler/glsl/opt_dead_functions.cpp":"774cae6536d02edf26e996a2a895e1f62d5098f16dc96b44798b4fc731a9a95f","glsl-optimizer/src/compiler/glsl/opt_flatten_nested_if_blocks.cpp":"3696a5c55f02e20056e085bc2714f73ac992f221b6f3387d655068e86b512046","glsl-optimizer/src/compiler/glsl/opt_flip_matrices.cpp":"44f0fe05b49329667671f88c96dc86ab3fe1459ff7b87f2b2d88de2d49829f9f","glsl-optimizer/src/compiler/glsl/opt_function_inlining.cpp":"fb56a33c90419a01676b57cbd91d0674a54cca40e6defaacc88dd33facebc131","glsl-optimizer/src/compiler/glsl/opt_if_simplification.cpp":"ac406eb35e379c357641d6c5749f50c65961455924d3dc884e2b90046fa92c5c","glsl-optimizer/src/compiler/glsl/opt_minmax.cpp":"8abd59d3b14ef60ff14a9c69660e6945f5cf10b97edb4afebe56be3f81d96316","glsl-optimizer/src/compiler/glsl/opt_rebalance_tree.cpp":"8bb6329dc0f299042368fc81934c2df019b45ab9f7aa0415d4e57b8d1ff98c9f","glsl-optimizer/src/compiler/glsl/opt_redundant_jumps.cpp":"222c73e2ac7a938ebb6428cc6c780c908ff6156d8ff935b04fed93a48fc10496","glsl-optimizer/src/compiler/glsl/opt_structure_splitting.cpp":"2edc79cc13f3177934e0443ad62f5976a1991f01f86ea303a803434849b13a47","glsl-optimizer/src/compiler/glsl/opt_swizzle.cpp":"015d0abddfe507f67c4b96c82988d861d018ededf7bf055e2bcbe9ea92da694e","glsl-optimizer/src/compiler/glsl/opt_tree_grafting.cpp":"46d28ac983ea244a4315bdc0e8892979ec4d1f9b9a96ac8a8a08006d9bc5e878","glsl-optimizer/src/compiler/glsl/opt_vectorize.cpp":"d80ee43bb97d9f016fb9c5e1e06f5b2afa569811f368ba067be794ec11d085fb","glsl-optimizer/src/compiler/glsl/program.h":"2982447e2abd35371e273ad87951722782a8b21c08294f67c39d987da1e1c55f","glsl-optimizer/src/compiler/glsl/propagate_invariance.cpp":"080943e21baa32494723a2eefb185915d2daae1f46d6df420145c5ad6857e119","glsl-optimizer/src/compiler/glsl/s_expression.cpp":"1ced972bc6ecc8eab4116ea71fb0212ab9ae5bcc0be3b47aa5d9d903566b3af1","glsl-optimizer/src/compiler/glsl/s_expression.h":"65b847e30e22a809b57d0bc70243049c99d9c6318803c5b8d0826aba55dc217e","glsl-optimizer/src/compiler/glsl/serialize.cpp":"be0eb4251348a9d921acb839a5c48c6023a2e9d116d602bb0432787ab623655d","glsl-optimizer/src/compiler/glsl/serialize.h":"57425732eba1233d928e5f07f88b623ce65af46b3bb034bf147f0a4b7f94f9a1","glsl-optimizer/src/compiler/glsl/shader_cache.cpp":"e0c5c433f2df3fccdf1d61281bfcb0ee5633433339b97c697d64db99611cbaaf","glsl-optimizer/src/compiler/glsl/shader_cache.h":"9217164d8d7f54aca0fe5922c7187095a6ae0cb703b196b79805aeef07a7e697","glsl-optimizer/src/compiler/glsl/standalone.cpp":"8e6c416a14d631261917a5fe4cc91880c287b22b2dfd70eb22028289a8fa5364","glsl-optimizer/src/compiler/glsl/standalone.h":"a7c397d1dfdd1e7fb2cfe99db35cd9df93251e642059208533202b7f20497f83","glsl-optimizer/src/compiler/glsl/standalone_scaffolding.cpp":"970d14b7a9d58e5270321f97bf5d57795558b1c570a56678e04a65b26c60bf4f","glsl-optimizer/src/compiler/glsl/standalone_scaffolding.h":"d921a617ea82b9e49413314492a645c44356de503581b1be3f1b57de236e480d","glsl-optimizer/src/compiler/glsl/string_to_uint_map.cpp":"d824bf5b839bd39498dc9e457103cdbe3e5289ddf7564107c27b1505948dd31f","glsl-optimizer/src/compiler/glsl/string_to_uint_map.h":"e2f18e66359c9d620e085de7f4a334a47df9c66e65a5bfe8b734c627bec04104","glsl-optimizer/src/compiler/glsl/test_optpass.h":"b27b8f35f5387e7ce4982bb51c7b63ccf14f91757f3108a5d02ed006925bb8a0","glsl-optimizer/src/compiler/glsl/xxd.py":"376484142f27f45090ea8203ae2621abf73f06175cb0ee8d96f44a3b9327f4bd","glsl-optimizer/src/compiler/glsl_types.cpp":"044bb6754f45419a3151e7a25c39202a82009ae3c6bc54ff7f0bb4258a5deefe","glsl-optimizer/src/compiler/glsl_types.h":"fd899a42f34ddeb8601bc3cd6c5e3aed82fc8aef4042dde1b39b3c01e1dcc219","glsl-optimizer/src/compiler/shader_enums.c":"436bff5216b11b0980bdfada5885fc6ac9afa2037a3027fcd6eea2a8635597ac","glsl-optimizer/src/compiler/shader_enums.h":"13220442a5c02e83540cf2c0ad4f8417b2fbda5f2586dec4e92082544c937cdd","glsl-optimizer/src/compiler/shader_info.h":"4c5453e81197ca83593ee4f365074b23530f2ab21c78e1733b63dec6f344c12a","glsl-optimizer/src/gallium/auxiliary/util/u_half.h":"3c2b37bda3ccb64387e44b723d29cf9046decab1a893bf42d842e9603398bdee","glsl-optimizer/src/gallium/include/pipe/p_compiler.h":"c75620096ce8523dae90599e50aa2ef6468d3b0e368a77795edeb20dd1abfc0c","glsl-optimizer/src/gallium/include/pipe/p_config.h":"a27692fc35f9e55df3224b7529e66b3001e911e94e6bc5f8f569e493e1ee3fb7","glsl-optimizer/src/gallium/include/pipe/p_defines.h":"be26d68c0acc67c5e44788c6299716a9eee415fd81d7d747e3738a829e3b6b38","glsl-optimizer/src/gallium/include/pipe/p_format.h":"5674215fc41d27496f037cf837717daefbf23ebb38d40ace7c0c414bc08182b0","glsl-optimizer/src/gallium/include/pipe/p_state.h":"d600593aba5f5a17072a6c38f6baa81e01c7994b0174250f7e433bb41684b702","glsl-optimizer/src/mapi/glapi/glapi.h":"73632a625c0ddabc401205e8b5a81eb8af8506868efe4b170d7979ec3619e9c5","glsl-optimizer/src/mesa/main/config.h":"5800259373099e5405de2eb52619f9de242552a479902a3a642a333c8cb3c1e7","glsl-optimizer/src/mesa/main/context.c":"2f3208473d99c94f734b1137ba91889d4a1babb9e7534bf1dc85d851ee98274e","glsl-optimizer/src/mesa/main/context.h":"cc7e4194797db9d007f01884e23d786c453b3860821f7f2ddcdf0f1bf3f8ffb1","glsl-optimizer/src/mesa/main/dd.h":"6a964acd06b6c2d88700e69fb75fe3c6b3b3d45bbc41db24f3f897a29695fe0c","glsl-optimizer/src/mesa/main/debug_output.h":"7312422e90b8c0e34028ac27280e438139b5cba525c99deb3ac883cd3d87e452","glsl-optimizer/src/mesa/main/draw.h":"7eaef3a9e27a60ea6f7937109bf3a6190b831162fde0479abb12077ce27c353d","glsl-optimizer/src/mesa/main/enums.h":"87d562a6764f51c014a2274fa7c3aca17c04441537ddd56b2554f13c6fffea92","glsl-optimizer/src/mesa/main/errors.h":"c79444b5df289c90fbb22a33b2d0c23917d9fc4510960088f0b79e53bb56b1b2","glsl-optimizer/src/mesa/main/extensions.h":"a38b2f87cc93c513994281350d69e06c84ff8eded5313ec0a1be33f375e0ebbd","glsl-optimizer/src/mesa/main/extensions_table.c":"17642d1a8c9a0bf2bd61060052d33ff14a005d2b962e6cf91465797a50851e85","glsl-optimizer/src/mesa/main/extensions_table.h":"2c879571c238d2e14461031ac740372fd0f9ac3a34c0d5541bb9b7ed4c0376c8","glsl-optimizer/src/mesa/main/formats.h":"02e2f7ec3e39286cf9f27e2641043e6df8ecb1dfde9e643313210e214af2a929","glsl-optimizer/src/mesa/main/glheader.h":"58217b33eead6aa6b23cd4a291cefeaa6cb84e465f4960daffca97c44d6d1c35","glsl-optimizer/src/mesa/main/glthread.h":"51fb2711f77e7eafcfc52d29d5b844978832b24c930d88accd48d143a6eb9c6f","glsl-optimizer/src/mesa/main/hash.h":"7e7f782034c16a8e693de48e00c31d4a90b0129f4029fd074033d7d16ccbe718","glsl-optimizer/src/mesa/main/macros.h":"73d15ddfd64f2b57b9b2ffeeb993b9c2c0899a80563e9d6ff337b11ccbe6eee5","glsl-optimizer/src/mesa/main/menums.h":"5dfac0e2279d60b0cd0c7b9fc2a5021620d0f6282ed2e738c420214e3af152d3","glsl-optimizer/src/mesa/main/mesa_private.h":"edda678b93438944279a551f663b8858ad84814a9fc88ba9672ef195599c24ae","glsl-optimizer/src/mesa/main/mtypes.h":"6efddefa099e4d2e3fdd97f0055644f47aba21711385edfeabc2d9b0676f2eec","glsl-optimizer/src/mesa/main/shaderobj.h":"9f0dfe96d0c2154201adef942bd36053533ac7b2492fb3786acda5bea514c75e","glsl-optimizer/src/mesa/main/uniforms.h":"4e331e6ad6e9cbded978b4082dbe0a57c1f8f01327446bb6892bfc179976c38b","glsl-optimizer/src/mesa/main/version.h":"9d0a13a758099302dc55cf7d045791834a89b0f9d4cf17b2692259b369a8a9a1","glsl-optimizer/src/mesa/math/m_matrix.h":"a37b19f182e070db3df93b0ede43c22fb8be8c2906504133ee6dbd7db1185d8b","glsl-optimizer/src/mesa/program/dummy_errors.c":"1820e305515b4c5e041f5e1623266a48ec8f076a155310be7d60637101f593e4","glsl-optimizer/src/mesa/program/ir_to_mesa.h":"b47f58d22e3ca2ae42d52501ea769d15c4476834944fa97eeccd3a3439211d00","glsl-optimizer/src/mesa/program/prog_instruction.h":"ab3832152a7e144b59e5a2264b2c29db56d93be31e76bbd958527a56771b40eb","glsl-optimizer/src/mesa/program/prog_parameter.h":"ba18c743284eadbc837c2c364c73e5d372321a7637a76e589d8d39fe8b5de225","glsl-optimizer/src/mesa/program/prog_statevars.h":"fc413698f84bc52d45fdeae0471934ee9904bfb7eac1a2b5f70446e54bcbbdca","glsl-optimizer/src/mesa/program/program.h":"1f01026a4eff440a3f122fd9b519d03546fe7f7d8be60dca834e95a2f8fbbfd2","glsl-optimizer/src/mesa/program/symbol_table.c":"6611cb9f078035bf5ff8c9112093a6c7d99f8af99a3931d0c07f227cc72283ea","glsl-optimizer/src/mesa/program/symbol_table.h":"631dc35ac48d5e87962d45507461920f6575610960ffcc42a08cefeb43300cda","glsl-optimizer/src/mesa/vbo/vbo.h":"6eb1dcd9a08c92f276c5fe08da184ff9d455d1be421913b8ad732a7b65e858fb","glsl-optimizer/src/util/bitscan.h":"9e49e694e6b34fe035bc685f32588827eb8cbe7d82878963c7ab52843e1c16aa","glsl-optimizer/src/util/bitset.h":"c40f78515c6230fed18345c6751ce33833a49da7a27901c7e6d7340cbdcbc5e7","glsl-optimizer/src/util/blob.c":"8f729846f66efc9c15485cc5fc24c6ec861fc1fecb2f652573f2a237d481b791","glsl-optimizer/src/util/blob.h":"93e1eaac866b9a7cd6fc03b533c18fb2edf0e97f03395eff4f3a605c4fc14d0c","glsl-optimizer/src/util/compiler.h":"79e3bf40a5bab704e6c949f23a1352759607bb57d80e5d8df2ef159755f10b68","glsl-optimizer/src/util/crc32.c":"2f3467a046b3a76784ecb9aa55d527698c8607fd0b12c622f6691aaa77b58505","glsl-optimizer/src/util/crc32.h":"59bd81865e51042b73a86f8fb117c312418df095fed2d828c5c1d1c8b6fc6cd4","glsl-optimizer/src/util/debug.c":"c3d68e9752ccc19e66c669562cd113cf1d0ac83cbb30174789e7fb8d1df58f9c","glsl-optimizer/src/util/debug.h":"50068d745c4199ccbd33d68dd4c8a36d2b5179c7869a21e75906ddd0718ca456","glsl-optimizer/src/util/detect_os.h":"343a8790d17a3710c6dd015ee367f84e3902ff3f2e36faca2bf93f9d725d3574","glsl-optimizer/src/util/disk_cache.c":"f533937e5a4fffe76e2739ef4b6b1e1da097d96d63eb808e68ebbc7027641c23","glsl-optimizer/src/util/disk_cache.h":"e83314fb14134a8e079b15e470a6376ba5a8253701f048c890a62b7e55d64bc8","glsl-optimizer/src/util/fast_urem_by_const.h":"e108fce804616c47d071dfe4a04163eec1126e448ed1aa89abb6b3a6d772bd5b","glsl-optimizer/src/util/fnv1a.h":"ab2596f19c6adf431ae27618f62c5743e24ad23ef83bb359a4c4c218245ab459","glsl-optimizer/src/util/format/u_format.h":"4cdfc0c59cbc99a092e5ec5a396910f2d93b9643e5d8141050b011e66f11e45b","glsl-optimizer/src/util/futex.h":"26f7c9d86e9ffef4c0fa2761f1aaa1918337302e20bd6ca10e61dc3c47356deb","glsl-optimizer/src/util/half_float.c":"11bc2584493d5d9d46e8c8a619a0307cf150bf5ab5d0f96bb764b061dc37a00e","glsl-optimizer/src/util/half_float.h":"7f7c380f126da1400a91758cc0392f24bf967bce1672890b62be26fe9fbd922b","glsl-optimizer/src/util/hash_table.c":"0ca40352e35dedab0a84c64c903f1b16d47e950bb5f43b4d22bb57d499bfea6e","glsl-optimizer/src/util/hash_table.h":"217191bb360592e2232f187473c10287d2cda8ae6fa5c53d0ef74c8c206118b4","glsl-optimizer/src/util/list.h":"9fab03c6a78186bb5f173269f825f6ce976b409d931852e3d93bac632e07989a","glsl-optimizer/src/util/macros.h":"63faf65b51058c483b17f1f77da51d1c53c8beab52678cb6bd01f1228a63b6b0","glsl-optimizer/src/util/mesa-sha1.c":"00c692ec353ebc02c06c57c5a71de0ab7a119f86a4146f452e65ec87e4944417","glsl-optimizer/src/util/mesa-sha1.h":"bff4c29f4bf7cdbcefb30fa0c996a7604a380eba8976467c2a60e7cd328f7e26","glsl-optimizer/src/util/mesa-sha1_test.c":"25da89a59d51469f77b4c468ca23ffdce0a7a1166a70b6cc23026a6800b0143c","glsl-optimizer/src/util/os_memory.h":"64555faf1760ae6954f42c83727c38dfc4c278e9152115779ffaad58b42adacf","glsl-optimizer/src/util/os_memory_aligned.h":"12d86fa94be38c13f7eeebdf313795e1267dd5a7187d2f0072e0e896f41702f6","glsl-optimizer/src/util/os_memory_stdc.h":"07360363b88c927065e10df71bebf6c8a0cc3b9167c9dfce55f2d65f11e6f787","glsl-optimizer/src/util/os_misc.c":"a9936e613ec84803abd59ad47c192c8e3939993c950ac91973fdc4cec1801bb8","glsl-optimizer/src/util/os_misc.h":"cc68eb12e05b5e749c54298cb4a6f4cd20cc5af7db3403e70b3c27b56090c740","glsl-optimizer/src/util/os_time.h":"73e775f7335244ff5964c678c27eedf1aea6abea44c4169d327ea8c7ce4a3a88","glsl-optimizer/src/util/ralloc.c":"4b51189595ef67bcef52c40cbf654d969041dbd15e15d4a893ad494ac060aeca","glsl-optimizer/src/util/ralloc.h":"e573c45875ff1530f0dbee9a93ae55535fdac8d5cc88a79ebc327c688824bde5","glsl-optimizer/src/util/rounding.h":"0450722353caf83de07e67f335949dbe95fe53b534052d4ee9d28d2781387614","glsl-optimizer/src/util/set.c":"86f8c9a830bead5a5a79bc970b0ff97809312af07b3beb39ef9d90af04d40a1b","glsl-optimizer/src/util/set.h":"3e39ca161e7ed4ec7c436cc9c7919ed9a55ed1b71edbf2caf6f9bcfd9bc578ed","glsl-optimizer/src/util/sha1/README":"00af7419af05247081858acb2902efd99fcda2ce16e331079f701645bb3729c0","glsl-optimizer/src/util/sha1/sha1.c":"1403bbe0aad42ba3e6be7e09f7cad87a6a8c4ad5b63962f7b92b9f37d8133b04","glsl-optimizer/src/util/sha1/sha1.h":"68d9f240eab2918026ecdf22be36811abbd4f1389f6c36e31258041aeaedd247","glsl-optimizer/src/util/simple_mtx.h":"12c6c3c4b7db9168bc656d5b3c65912075084d2b388c415d5c3d3f5953a9d6c7","glsl-optimizer/src/util/softfloat.c":"a97e51a96fe5e6a052c02aa6bbec683fe73fb88a8c087d9c930503e2120d8a2e","glsl-optimizer/src/util/softfloat.h":"66664b0250e83bf5dd4cc743acd119d076efcea624a0eab3d6b60718e6ee8811","glsl-optimizer/src/util/string_buffer.c":"63a1d1b1e34926c88ea00159cafbcd56568b805c4f64d1e8c97169fe313921fc","glsl-optimizer/src/util/string_buffer.h":"7b88d1b1d9c6cfb8e93331813535c127289437c75f822029e9a3bca8ea6b52ee","glsl-optimizer/src/util/strndup.h":"0273c4fdb7482cd7746881a63d3998648c6d63415ba85af1d1860f0e0dc504c6","glsl-optimizer/src/util/strtod.c":"5cf610d8a37373cf37cfb7aae903525d943b2674b1f32594c70b0eb19a8c9697","glsl-optimizer/src/util/strtod.h":"237396def4e264d35ed4bedea00ef9a4ceab6d7a11a18c770d9747d22c69ed2d","glsl-optimizer/src/util/u_atomic.h":"c02e809526c6c09ba8fe51f50b2490d1b6c8e5c7f3c4031ae958250d098fc3bb","glsl-optimizer/src/util/u_debug.c":"8c060e379b816618f3dd22c9ea523c68b9425c76c36a7dfe5d6d375b337f5f4a","glsl-optimizer/src/util/u_debug.h":"e11e26edd9b9e4e6f8e6a435e69f4d9edda27e9a379f68f4c82ea2525aaaea68","glsl-optimizer/src/util/u_dynarray.h":"853d0fa6ff2261614488be624deb8a2b01e57c2c8eabc28578cbeed4ccc95694","glsl-optimizer/src/util/u_endian.h":"3ccea7e529740318d8a4b05c00db3adc9d1e292a52bdc56a05c9fae99209720f","glsl-optimizer/src/util/u_math.c":"c868a8c0886dc78f1b06b13404ba8b253090449045774dd56893ac9d75795184","glsl-optimizer/src/util/u_math.h":"a04e32e126db016413f9de0a2028a3e71737137463b1289eae576f884b06fcf1","glsl-optimizer/src/util/u_memory.h":"c5db17c724c70283ddbe04165722f6988d4e0eb9aa3602ae472feff016649af9","glsl-optimizer/src/util/u_queue.h":"92930ce236c0528a98b695f5cea8c5c6aa9683beaf71a2227bdc5d33d1b21506","glsl-optimizer/src/util/u_string.h":"c5a2f4ef576d1547bda12c4ea219179fefa54414977743ac094abcaf696ef6ca","glsl-optimizer/src/util/u_thread.h":"00b708459b27f9910d18db92c18cc65cfc618ac2b3cd144e45f8640057b10d58","glsl-optimizer/src/util/xxhash.h":"2f2aff2fc6c0c929f52cf6ae7314122124c5be026d41ad1c357608383c4a37ad","src/bindings.rs":"79993db2058bde39f99ef483d02560d33b1cb882f6a552319e8b86eb6f9021e1","src/lib.rs":"04be1554cd829eb40864b06d80b491dd48117a4e3a601c7d482117f7a0391e67","wrapper.hpp":"f3ea34cc496f7d90b9bfcada3250b37b314c3524dac693b2ece9517bc7d274ac"},"package":"8ba4741358604ca0848c27ecc069d68e62e11cde81e38aac1da3c54b79ab5adf"} +\ No newline at end of file ++{"files":{".cargo_vcs_info.json":"7075d1c5c5e19288cefb431f16462eaa23229d02791120f4885ab1d20470cb7e","Cargo.lock":"f7970552595dc803ace9ef19b5f5d7b1fc784aac30cb27b2ebc3002d97122b9d","Cargo.toml":"7c53ee20d848f9913cacbfcb3ab2e89e30deee8d619d173c95130c7c5d065827","README.md":"4468e08c64c19977707d792bfab0080e35ff927b64990eab77873f8ba056ba1c","build.rs":"92e29699487c21389fc823c50b410cfbfc74cc774265d24958489909ee48a076","glsl-optimizer/.editorconfig":"dca7ff05a95f608849c4dc640af7f83a0f415618e327a2ecb6a0afa0d9d2bacb","glsl-optimizer/.gitignore":"8ba554a4ca510ea7d9684475aa043edbeba7d15a5c9c4a04d8b1379a04ec6270","glsl-optimizer/CMakeLists.txt":"42ce94744e82ffa000da8b64d81fc140e293b9f5da7dd4cf6b49e7404a2448d9","glsl-optimizer/README.md":"b18eef11a92d267d88a937b1154f7670ee433c730b102fdf7e2da0b02722b146","glsl-optimizer/contrib/glslopt/Main.cpp":"14ba213210c62e234b8d9b0052105fed28eedd83d535ebe85acc10bda7322dd4","glsl-optimizer/contrib/glslopt/Readme":"65d2a6f1aa1dc61e903e090cdade027abad33e02e7c9c81e07dc80508acadec4","glsl-optimizer/generateParsers.sh":"878a97db5d3b69eb3b4c3a95780763b373cfcc0c02e0b28894f162dbbd1b8848","glsl-optimizer/include/GL/gl.h":"1989b51365b6d7d0c48ff6e8b181ef75e2cdf71bfb1626b1cc4362e2f54854a3","glsl-optimizer/include/GL/glext.h":"2ac3681045a35a2194a81a960cad395c04bef1c8a20ef46b799fb24af3ec5f70","glsl-optimizer/include/KHR/khrplatform.h":"1448141a0c054d7f46edfb63f4fe6c203acf9591974049481c32442fb03fd6ed","glsl-optimizer/include/c11/.editorconfig":"f96a2354e5f2b90367d643e6d9e980ce76278d4d47afd8b2713b595753aa8b4b","glsl-optimizer/include/c11/threads.h":"56e9e592b28df19f0db432125223cb3eb5c0c1f960c22db96a15692e14776337","glsl-optimizer/include/c11/threads_posix.h":"f8ad2b69fa472e332b50572c1b2dcc1c8a0fa783a1199aad245398d3df421b4b","glsl-optimizer/include/c11/threads_win32.h":"95bf19d7fc14d328a016889afd583e4c49c050a93bcfb114bd2e9130a4532488","glsl-optimizer/include/c11_compat.h":"103fedb48f658d36cb416c9c9e5ea4d70dff181aab551fcb1028107d098ffa3e","glsl-optimizer/include/c99_compat.h":"aafad02f1ea90a7857636913ea21617a0fcd6197256dcfc6dd97bb3410ba892e","glsl-optimizer/include/no_extern_c.h":"40069dbb6dd2843658d442f926e609c7799b9c296046a90b62b570774fd618f5","glsl-optimizer/license.txt":"e26a745226f4a46b3ca00ffbe8be18507362189a2863d04b4f563ba176a9a836","glsl-optimizer/src/compiler/builtin_type_macros.h":"5b4fc4d4da7b07f997b6eb569e37db79fa0735286575ef1fab08d419e76776ff","glsl-optimizer/src/compiler/glsl/README":"e7d408b621c1b605857c4cab63902f615edb06b530142b91ac040808df6e22f7","glsl-optimizer/src/compiler/glsl/TODO":"dd3b7a098e6f9c85ca8c99ce6dea49d65bb75d4cea243b917f29e4ad2c974603","glsl-optimizer/src/compiler/glsl/ast.h":"3e68ff374350c49211a9931f7f55a485d8d89fc4b21caaffbf6655009ad95bf8","glsl-optimizer/src/compiler/glsl/ast_array_index.cpp":"92b4d501f33e0544c00d14e4f8837753afd916c2b42e076ccc95c9e8fc37ba94","glsl-optimizer/src/compiler/glsl/ast_expr.cpp":"afd712a7b1beb2b633888f4a0911b0a8e4ae5eb5ab9c1e3f247d518cdaaa56d6","glsl-optimizer/src/compiler/glsl/ast_function.cpp":"74f4fbd490e366b37f4715168bb3465ecd9334d4130942f75dcc8e80e8e7f027","glsl-optimizer/src/compiler/glsl/ast_to_hir.cpp":"d0f798eb09271d41d068b9e7b18220d37f1ed0083300ab51eba30989698fe23d","glsl-optimizer/src/compiler/glsl/ast_type.cpp":"8eb790b24b26dfb72bdc333744b566c26d8464c5d47d20eae659461f5c4899f7","glsl-optimizer/src/compiler/glsl/builtin_functions.cpp":"454189d643c220fcb49116ee5c8a34f7b349aa67564040deb8607f6a41a15e70","glsl-optimizer/src/compiler/glsl/builtin_functions.h":"a37cad7ed09b522c5b8bec7b80115a36846e7ba6e0874a2a858e32f7f202c665","glsl-optimizer/src/compiler/glsl/builtin_int64.h":"619def6f3aebf180da3944ef08f159ab12a58b24767e41d8b985ac37ded54d62","glsl-optimizer/src/compiler/glsl/builtin_types.cpp":"afec060b62d6f3b00bfbf94e9fa5f96341ce096c128d1eef322791e6ed9cea4d","glsl-optimizer/src/compiler/glsl/builtin_variables.cpp":"6563bfb1345cbca4c77e00eef09ad152f3e1dc271d246a08c5ce9e1f4ce4250a","glsl-optimizer/src/compiler/glsl/float64.glsl":"1072fd888be48c2a7a5117cd2d92a65f034965a66375f598bb856bff5d7be766","glsl-optimizer/src/compiler/glsl/generate_ir.cpp":"e5f0175370a0d07f93c48d3f0f1b8233d12c64a7b02de02dcc753ef7b398ef0f","glsl-optimizer/src/compiler/glsl/glcpp/README":"a0332a1b221d047e9cce5181a64d4ac4056046fd878360ec8ae3a7b1e062bcff","glsl-optimizer/src/compiler/glsl/glcpp/glcpp-lex.c":"2d179879b1ffe84f58875eee5b0c19b6bae9c973b0c48e6bcd99978f2f501c80","glsl-optimizer/src/compiler/glsl/glcpp/glcpp-lex.l":"e4c5744c837200dafd7c15a912d13f650308ea552454d4fa67271bc0a5bde118","glsl-optimizer/src/compiler/glsl/glcpp/glcpp-parse.c":"03494f9ce1cb82260506e2559e73a3eeb622c4bd51b65eaa0a2c3351862bd4c8","glsl-optimizer/src/compiler/glsl/glcpp/glcpp-parse.h":"264d9a18421cde255ce34a0a62b3d8e73465359f0d167e64aa3973062aae5bdd","glsl-optimizer/src/compiler/glsl/glcpp/glcpp-parse.y":"fafb66e3a8f149d19e085f18a4273ba6d4c11af9e9a01d665cc784dddf97b79f","glsl-optimizer/src/compiler/glsl/glcpp/glcpp.c":"37ed294403c2abfd17fd999d1ae8d11b170e5e9c878979fefac74a31195c96b0","glsl-optimizer/src/compiler/glsl/glcpp/glcpp.h":"85ac8b444bcbd0822b66448a1da407b6ae5467b649f5afaf5c58325bd7569468","glsl-optimizer/src/compiler/glsl/glcpp/pp.c":"a52d94f1bcb3fb2747a95709c4a77c25de7eea8354d2b83bb18efd96976a4473","glsl-optimizer/src/compiler/glsl/glcpp/pp_standalone_scaffolding.c":"d11aeb3acfe966d1b78f1ee49804093f2434214c41391d139ffcb67b69dc9862","glsl-optimizer/src/compiler/glsl/glcpp/pp_standalone_scaffolding.h":"abbf1f36ec5a92d035bfbb841b9452287d147616e56373cdbee1c0e55af46406","glsl-optimizer/src/compiler/glsl/glsl_lexer.cpp":"272b9fc1383d72b81bfc03fa11fdf82270ed91a294e523f9ce2b4554bd3effa9","glsl-optimizer/src/compiler/glsl/glsl_lexer.ll":"2b57d9f9eb830c3d7961d4533048a158ee6f458c8d05c65bea7b7cfbc36e4458","glsl-optimizer/src/compiler/glsl/glsl_optimizer.cpp":"f8095d20629d0af70be930b0612e169edb274551a1d25a3cd1bf9995a11ce2e8","glsl-optimizer/src/compiler/glsl/glsl_optimizer.h":"22e843b4ec53ba5f6cd85ca5f7bad33922dca8061b19fb512d46f1caca8d4757","glsl-optimizer/src/compiler/glsl/glsl_parser.cpp":"126baf368d525aba301854e3d91ba60b5aee32e1102376af71416f32cb95ec48","glsl-optimizer/src/compiler/glsl/glsl_parser.h":"2ea9a50716098a8f7bef782d2a030d757b68da73afb01b4d4940d3e8381d44e8","glsl-optimizer/src/compiler/glsl/glsl_parser.yy":"6b1fd1576b29fce005dff744a6dbd0219e4c695c361d61864e1f3a8d6fa6b764","glsl-optimizer/src/compiler/glsl/glsl_parser_extras.cpp":"aad64b5b66467da650091430681e8c6a820cf3cadc4db3c160bf2f15875390ae","glsl-optimizer/src/compiler/glsl/glsl_parser_extras.h":"71fd0e92bbdb193dfb067d7bfdb1200d77392be2fbd0cbfc9ca89d1bb4c7e741","glsl-optimizer/src/compiler/glsl/glsl_symbol_table.cpp":"6660fb83c0ddddbbd64581d46ccfdb9c84bfaa99d13348c289e6442ab00df046","glsl-optimizer/src/compiler/glsl/glsl_symbol_table.h":"24682b8304e0ea3f6318ddb8c859686bd1faee23cd0511d1760977ae975d41bf","glsl-optimizer/src/compiler/glsl/hir_field_selection.cpp":"72a039b0fcab4161788def9e4bedac7ac06a20d8e13146529c6d246bd5202afd","glsl-optimizer/src/compiler/glsl/int64.glsl":"303dbe95dde44b91aee3e38b115b92028400d6a92f9268975d607471984e13eb","glsl-optimizer/src/compiler/glsl/ir.cpp":"2b4741cce90b5d4abff5d719c7324e2693c67294d4d99736cb241554adb281bc","glsl-optimizer/src/compiler/glsl/ir.h":"990b1c74447c4eb4835353ccb0ed9aea644f97fc1129ef1739cd935075d85d2e","glsl-optimizer/src/compiler/glsl/ir_array_refcount.cpp":"8cdc1cffe01e42e0566fa2193a75f789628e8025ad1b82f0ee6f204451b7f9f7","glsl-optimizer/src/compiler/glsl/ir_array_refcount.h":"75f06ec81342b379096ca52e1dc0fd5f19a11ff8e9b58203c20628179d644c12","glsl-optimizer/src/compiler/glsl/ir_basic_block.cpp":"1e2920b1c0ecb08424c745c558f84d0d7e44b74585cf2cc2265dc4dfede3fa2f","glsl-optimizer/src/compiler/glsl/ir_basic_block.h":"81be7da0fc0ee547cd13ec60c1fcd7d3ce3d70d7e5e988f01a3b43a827acdf05","glsl-optimizer/src/compiler/glsl/ir_builder.cpp":"daba29c5a1efdd5a9754f420eb3e2ebdf73485273497f40d4863dadeddb23c0d","glsl-optimizer/src/compiler/glsl/ir_builder.h":"2822e74dd3f6e3df8b300af27d5b11ea2dd99d0e5e7ca809b7bbcce9833c483c","glsl-optimizer/src/compiler/glsl/ir_builder_print_visitor.cpp":"8c6df5abf2fe313363f285f171c19ca6c8ee4f3bc2ed79d33c0c88cc8be45c48","glsl-optimizer/src/compiler/glsl/ir_builder_print_visitor.h":"799852adc3a0e54d04080655e7cebfa0d3bf5b6ffed5d8414f141380665d4db7","glsl-optimizer/src/compiler/glsl/ir_clone.cpp":"d897a4e1f5bbec4a6a2f15044c1be9a4d13899c73be77335b041049a4589aa5d","glsl-optimizer/src/compiler/glsl/ir_constant_expression.cpp":"78bd87ddb09db67f6c499067728d72aef4f16aa02721a99a4b769d1e0cfa9010","glsl-optimizer/src/compiler/glsl/ir_equals.cpp":"bca28533a6310b0fc152b56d80872368f1510dc62ed6e8ac199b9ffa7fac02e7","glsl-optimizer/src/compiler/glsl/ir_expression_flattening.cpp":"7e918d4e1f237eca01396004015865ce345afe32a876c9dbc6728576a1a7eae4","glsl-optimizer/src/compiler/glsl/ir_expression_flattening.h":"f45b66aa9497520e7e08e612d24b308477c34477fbd963ee9320eac664957f16","glsl-optimizer/src/compiler/glsl/ir_expression_operation.h":"cc9f10727dbd26cac506804f51456302c702650f9eeb59054a7e1575d5cf6687","glsl-optimizer/src/compiler/glsl/ir_expression_operation.py":"7b86c96021b9fbe165957f4ecb0b612fefcde1c2cf3c6d75e3cdb22e369216ba","glsl-optimizer/src/compiler/glsl/ir_expression_operation_constant.h":"9ad3346416392e3efa11e12ecf2feca7453c5253d241eb96c91dfb85d4f2b971","glsl-optimizer/src/compiler/glsl/ir_expression_operation_strings.h":"a6826daf496a8b9e89885bc2a161ac3445d501b23c6e0ac33e2c01b506b273c8","glsl-optimizer/src/compiler/glsl/ir_function.cpp":"7537365fc0fbe4b37a26b9a2146cc64d3e9a774d60eab63b65002ad165ae8fc7","glsl-optimizer/src/compiler/glsl/ir_function_can_inline.cpp":"faddbf112187a048d502716a3fb82570a322299ba2a3abd79388382c82040bfc","glsl-optimizer/src/compiler/glsl/ir_function_detect_recursion.cpp":"9176973eaf5c0a984701f953bb7a80f37dca43d59b5bce50fc69b3f02f2902d7","glsl-optimizer/src/compiler/glsl/ir_function_inlining.h":"9739493f99c489987d650762fccdd3fb3d432f6481d67f6c799176685bd59632","glsl-optimizer/src/compiler/glsl/ir_hierarchical_visitor.cpp":"3725861fbe2b98e0617f52d3b14cf6d3b25fb5ec00f5ef5d308b03642f592767","glsl-optimizer/src/compiler/glsl/ir_hierarchical_visitor.h":"e0560210e966c0c31e4ca843e80ea154e64db5a444b8c2df845b6ba5b3a43fc1","glsl-optimizer/src/compiler/glsl/ir_hv_accept.cpp":"caf7ce2cd9494aadd3c58bcf77f29de58368dc9e347a362bbf37f8bda9509b80","glsl-optimizer/src/compiler/glsl/ir_optimization.h":"8b3dcfc7f9e96b21a8dd47a0040d90be483a9e67a2cdce3a697188fb758d4630","glsl-optimizer/src/compiler/glsl/ir_print_glsl_visitor.cpp":"f8e34a983452be0dcb5a695e9c8e895eead24f9e540992a8afe510ae85da4c4c","glsl-optimizer/src/compiler/glsl/ir_print_glsl_visitor.h":"1ad1bd3efd1ace39051c13f904c05fd80425d329444f9a8d47fd6d948faf46e0","glsl-optimizer/src/compiler/glsl/ir_print_visitor.cpp":"643f5a68aae3fb37267fd793f1216d1cfdeb2c09338c26b1f30e4c6deaef4de5","glsl-optimizer/src/compiler/glsl/ir_print_visitor.h":"4573eb93268a2654c14b505253dd651e2695d43dc745904d824da18305269b95","glsl-optimizer/src/compiler/glsl/ir_reader.cpp":"06bfba802c8354e5a8b2334b6d78d6297de18235bedd3f8fbb382c89870b02f2","glsl-optimizer/src/compiler/glsl/ir_reader.h":"63e3f7f1597936a7011d5b520e171b197bf82bee6c1560d822c3edf5aaa6f9e9","glsl-optimizer/src/compiler/glsl/ir_rvalue_visitor.cpp":"84b5c5d746555adca85759c2912fe48010232b7c1c0bd2cf03bd04067a85e66f","glsl-optimizer/src/compiler/glsl/ir_rvalue_visitor.h":"fd8c561b71085d3211fff85ed514fecb299d8ce19a04bc063419a55b6d840525","glsl-optimizer/src/compiler/glsl/ir_set_program_inouts.cpp":"ab9f115ce9e7f312d9c7978340ced0dc4ae6d13a80e08442ba9709d11d50cae5","glsl-optimizer/src/compiler/glsl/ir_uniform.h":"683ae6896b1a08470c090be5f822fc31cd434eab9216e954b9bba24a46975109","glsl-optimizer/src/compiler/glsl/ir_unused_structs.cpp":"9c1620c45f2fc071fe5ed828472040b14c5f42effe06aa0e3b8352c95ef78786","glsl-optimizer/src/compiler/glsl/ir_unused_structs.h":"13387b49c23093575276b25b9dfd31fedd8f131c5c4f3128ab04cf03e15b5295","glsl-optimizer/src/compiler/glsl/ir_validate.cpp":"6b232be5999a86ea278f4f15b2832d76843246509118d924243055a3b9b0299f","glsl-optimizer/src/compiler/glsl/ir_variable_refcount.cpp":"2764a3cad937d53f36db7447c3a5b98b04bf153acf81074d971857fc5bca460d","glsl-optimizer/src/compiler/glsl/ir_variable_refcount.h":"b0668e3eb1501ef65e38fe12830742ecb3d28e6039f30e366c8924efc29b4a39","glsl-optimizer/src/compiler/glsl/ir_visitor.h":"f21b3534c3d66d5fb707d1581fece7e1eb043523afbaedf89918cfb031c6df94","glsl-optimizer/src/compiler/glsl/link_atomics.cpp":"360f0209e11f367ba358223597b0a118bae095bff16337cf03f1fb89c5b80ca6","glsl-optimizer/src/compiler/glsl/link_functions.cpp":"de7895da8aa33a1e3c2c1eb2fdaf267ab5d1fbfdb79ae2e67f95211e946e294c","glsl-optimizer/src/compiler/glsl/link_interface_blocks.cpp":"1926cfa73810704eb19b916c1b2cdb9321155e2f98b2a0a57c7c3c6e960540cd","glsl-optimizer/src/compiler/glsl/link_uniform_block_active_visitor.cpp":"1e14e06ca3b2c1089cfba2e8eaf0c1f373d9d6374b6082f320962dd71ae09611","glsl-optimizer/src/compiler/glsl/link_uniform_block_active_visitor.h":"fd58c155af645295bb6aec08797889de586f4d919731de2bce57e8dce59bb048","glsl-optimizer/src/compiler/glsl/link_uniform_blocks.cpp":"09589f49776dce32e6c4044937de7e0c839a9754ad31960148f8f9e010658997","glsl-optimizer/src/compiler/glsl/link_uniform_initializers.cpp":"bf98e08c12db466acf9623cbeb8fa8e3b4002512722e7a6521287f558a099f37","glsl-optimizer/src/compiler/glsl/link_uniforms.cpp":"84bad5b1377362cecf259b05124239be5220b03ce1c0c61b59bd9a47e4379af2","glsl-optimizer/src/compiler/glsl/link_varyings.cpp":"a5f1a53e7c80d635515fe808ff223d89fef1767abb0f2b7aa28fa6773dca353f","glsl-optimizer/src/compiler/glsl/link_varyings.h":"b9dbe018f038df69763df2e928742ce81bbc6e3aaba26f50621e30a6d9aa6220","glsl-optimizer/src/compiler/glsl/linker.cpp":"40b1ecd5d4f6c7f13d5a87ce390561a51fdf6f3fcd9b2197b9c88b03a773ba94","glsl-optimizer/src/compiler/glsl/linker.h":"ecf94b4ad75ef461c27c557fda4bd25f34c91930822b8e1d729ec84520d4a049","glsl-optimizer/src/compiler/glsl/linker_util.cpp":"1663ad88e2a369305659aeeffaedb5bd752cf76340a2ba5797fc0bf600633cf9","glsl-optimizer/src/compiler/glsl/linker_util.h":"6db788daf9c8e87ae2764b61a8b37ebe419e69c1b82ddee01986e37c978c6993","glsl-optimizer/src/compiler/glsl/list.h":"b1f46ce0e552fe7c45b2a19408a9d97662e23e4b182ab335491c26f8cf25886f","glsl-optimizer/src/compiler/glsl/loop_analysis.cpp":"57ecd573477c68091c7cc99537faa7139a8f395935e3d4f10144cefdefb5a611","glsl-optimizer/src/compiler/glsl/loop_analysis.h":"a85f045a038ee5b5176063e85d7988865862c44ab0580f771b993a042d0b69cc","glsl-optimizer/src/compiler/glsl/loop_unroll.cpp":"bd4292ea2809f5a669bcb76ceaa1ac365772dcd638c579c3ed10275214901a54","glsl-optimizer/src/compiler/glsl/lower_blend_equation_advanced.cpp":"8cfbef140d9c4b4d2f57bfa05c9c374d31a121d0f87afce94333f049023b654a","glsl-optimizer/src/compiler/glsl/lower_buffer_access.cpp":"1ae221c3c7a95aeb867207e7a742be635f91b406c157747bfd6ddf10274d97fb","glsl-optimizer/src/compiler/glsl/lower_buffer_access.h":"807886953a576a323591798cbca5e2df24295ea893b28affd8ffb5926cebaa04","glsl-optimizer/src/compiler/glsl/lower_builtins.cpp":"4d81afc32cf58e1481fcb5e42888ab93dbe6820310a20ff7a9982b77b2152d9b","glsl-optimizer/src/compiler/glsl/lower_const_arrays_to_uniforms.cpp":"608403f0eeeedf21cfcd3014116e0f44e28cbdf6c4c32aac7e613e64e30205e1","glsl-optimizer/src/compiler/glsl/lower_cs_derived.cpp":"179905cd47a294122adeb5b0abfed6f2f67782dcde21b544d1ee2c1985154e66","glsl-optimizer/src/compiler/glsl/lower_discard.cpp":"3b361b2db0004d544d64611cb50d5a6e364cf6c5f2e60c449085d7d753dd7fb0","glsl-optimizer/src/compiler/glsl/lower_discard_flow.cpp":"f5c29b6a27690bb5c91f196d1a1cf9f6be4f1025292311fe2dac561ce6774dee","glsl-optimizer/src/compiler/glsl/lower_distance.cpp":"a118c85493d5d22b2c059a930c51a5854896d4b1dade76598eaa985e5a3dff8c","glsl-optimizer/src/compiler/glsl/lower_if_to_cond_assign.cpp":"469e617757fd1728709cce021aac5c8da05ee503bf5366977bdc4ef7a6d83950","glsl-optimizer/src/compiler/glsl/lower_instructions.cpp":"6ff5c396abe40d8a2145d571e99e2bbe9143393e15aafc28adc2803a01d821b6","glsl-optimizer/src/compiler/glsl/lower_int64.cpp":"d1ed41196880dd53c7b13e2782f9423f8442bf1d46186e8be92b1b66218a83ee","glsl-optimizer/src/compiler/glsl/lower_jumps.cpp":"34de7b493f281589fb0c2c0f6e885d0a0fabbe7a4e97a73de374dd714777a58c","glsl-optimizer/src/compiler/glsl/lower_mat_op_to_vec.cpp":"dff7a308edc4846c348ed4225c6699a9c75abac68d88f41f85954276552779f4","glsl-optimizer/src/compiler/glsl/lower_named_interface_blocks.cpp":"16063ac127bff75a68272070ab11c21c25101edbff62b4c68f4983b4cd941af0","glsl-optimizer/src/compiler/glsl/lower_offset_array.cpp":"3b00773399135aea85746a5a68b96ef000bc6841be1a2c8e6f25c516628b0949","glsl-optimizer/src/compiler/glsl/lower_output_reads.cpp":"a0fc9975d5aa1617e21fc6c353659a9802da9e83779a3eef4ec584f74b4dadc5","glsl-optimizer/src/compiler/glsl/lower_packed_varyings.cpp":"7550099d4ae123d71541c2fc88bc04fbfe9271ec75d7e210987d1c8cac3cf3ea","glsl-optimizer/src/compiler/glsl/lower_packing_builtins.cpp":"79a13d161fe505a410ab948d92769395708693ec888153630fa240e5b97e356f","glsl-optimizer/src/compiler/glsl/lower_precision.cpp":"f82a185b879872b977a1787d8061b9a80bc4cf8db1b970db6efba2ad9cc20fa2","glsl-optimizer/src/compiler/glsl/lower_shared_reference.cpp":"ea2dccf50a83bc19391bf6b7ab6aa53c0005f427af4066d25140340af9a4beef","glsl-optimizer/src/compiler/glsl/lower_subroutine.cpp":"f69fa53650eeb6f2944fce4d36a6e0a423e6705f3a3bd3389c7fadb83cfc8802","glsl-optimizer/src/compiler/glsl/lower_tess_level.cpp":"b196c9d424c0569f3e85d75c2d125af21566cb113d69036db87c0990703e0fa7","glsl-optimizer/src/compiler/glsl/lower_texture_projection.cpp":"4d247f244272adc8250fd888d8d932a140dd5de4d1efc7a58492c3c2b8291527","glsl-optimizer/src/compiler/glsl/lower_ubo_reference.cpp":"89bdbc6c1669230c644c0857db1ce2781ec61d349ecd08c7914146e1f4750a4a","glsl-optimizer/src/compiler/glsl/lower_variable_index_to_cond_assign.cpp":"fce930f29ac9405b297d1f749d68f59506b89c70b4ee1b1ab8cf49a34cc71ecf","glsl-optimizer/src/compiler/glsl/lower_vec_index_to_cond_assign.cpp":"3c67d851a11a55fad1c49a550f3a0cfe50892d33a3f238ce266cd829eba510a8","glsl-optimizer/src/compiler/glsl/lower_vec_index_to_swizzle.cpp":"f5ec666b73e1415cbab32519a53605ed385f3b03e889560373dbce69dda5000e","glsl-optimizer/src/compiler/glsl/lower_vector.cpp":"f7c13f5572ebe09b6a71553133b2cf003cd4b77b9657600672ee3b21bf890725","glsl-optimizer/src/compiler/glsl/lower_vector_derefs.cpp":"b05793da6dd620a531b43df5af8b2ecbc37b9db0c88910f5724ea10bcd057e19","glsl-optimizer/src/compiler/glsl/lower_vector_insert.cpp":"fee772ec17eea5e86a529bf9c5fa2ee0d29a5982bb75ebc6d68ed36cd19aa299","glsl-optimizer/src/compiler/glsl/lower_vertex_id.cpp":"690e8715182e03fead5cc5a35251fb4f41b357e4c71a1dfbc4bd7be19862b56d","glsl-optimizer/src/compiler/glsl/lower_xfb_varying.cpp":"58c0e8b270e4bbde54250be03cdb2f36966bcafb785372ad2e2b786835df7f9f","glsl-optimizer/src/compiler/glsl/main.cpp":"ae5e88abbbc8a12f769e1296bad938b9d7398cc6da0d3d0caeceeeb876536850","glsl-optimizer/src/compiler/glsl/opt_add_neg_to_sub.h":"f5054944bfd068810629080d0ea11df78b3f57a8f86df75e13ca50157ad1964d","glsl-optimizer/src/compiler/glsl/opt_algebraic.cpp":"25f45b20e1972ee8c789177a1aeda6e4286c25db2eae3a43ff83029ae64969c0","glsl-optimizer/src/compiler/glsl/opt_array_splitting.cpp":"19d3ce0e815438f4df9ab2890e767b03a4f3f191b53bb30c0217cf2ae6a95430","glsl-optimizer/src/compiler/glsl/opt_conditional_discard.cpp":"0e44e0e126711a3725c1f3a2aa65ff03c381fed08680ffc30101aae60f716c4e","glsl-optimizer/src/compiler/glsl/opt_constant_folding.cpp":"a088d04d9b45f9e55e235835648f614c89b7803c03a6d4f6a6d1a6bc1f0228bd","glsl-optimizer/src/compiler/glsl/opt_constant_propagation.cpp":"8a9440d77ecd6dcf13e683cbb99943aab6311c8fd4b5f6a9189a8d4f270746f4","glsl-optimizer/src/compiler/glsl/opt_constant_variable.cpp":"63d3ccd4dd09f19c9cf1a2f51592111bed41284504f29f3c0de4cadebc439a37","glsl-optimizer/src/compiler/glsl/opt_copy_propagation_elements.cpp":"ffa0f50863995e0d2e31f55a52e82319edc71e520987bebd7f7e561ea331c64b","glsl-optimizer/src/compiler/glsl/opt_dead_builtin_variables.cpp":"84e8747b948232f01dd56b428b9315f96f9511f605f240119fc446fae28981a9","glsl-optimizer/src/compiler/glsl/opt_dead_builtin_varyings.cpp":"761523e88f5b3ba785170f4d7205e94fa99acb7e74d29efbe40e1c010e1dbdb3","glsl-optimizer/src/compiler/glsl/opt_dead_code.cpp":"fd1ba2da7337d4e5dad17f5c2d73d9cc8880305f423e85d64cf94553588fa401","glsl-optimizer/src/compiler/glsl/opt_dead_code_local.cpp":"969a598b4df322baf222258a66cd64a326ea20e5b3125be9d8d1771f522c69e0","glsl-optimizer/src/compiler/glsl/opt_dead_functions.cpp":"774cae6536d02edf26e996a2a895e1f62d5098f16dc96b44798b4fc731a9a95f","glsl-optimizer/src/compiler/glsl/opt_flatten_nested_if_blocks.cpp":"3696a5c55f02e20056e085bc2714f73ac992f221b6f3387d655068e86b512046","glsl-optimizer/src/compiler/glsl/opt_flip_matrices.cpp":"44f0fe05b49329667671f88c96dc86ab3fe1459ff7b87f2b2d88de2d49829f9f","glsl-optimizer/src/compiler/glsl/opt_function_inlining.cpp":"fb56a33c90419a01676b57cbd91d0674a54cca40e6defaacc88dd33facebc131","glsl-optimizer/src/compiler/glsl/opt_if_simplification.cpp":"ac406eb35e379c357641d6c5749f50c65961455924d3dc884e2b90046fa92c5c","glsl-optimizer/src/compiler/glsl/opt_minmax.cpp":"8abd59d3b14ef60ff14a9c69660e6945f5cf10b97edb4afebe56be3f81d96316","glsl-optimizer/src/compiler/glsl/opt_rebalance_tree.cpp":"8bb6329dc0f299042368fc81934c2df019b45ab9f7aa0415d4e57b8d1ff98c9f","glsl-optimizer/src/compiler/glsl/opt_redundant_jumps.cpp":"222c73e2ac7a938ebb6428cc6c780c908ff6156d8ff935b04fed93a48fc10496","glsl-optimizer/src/compiler/glsl/opt_structure_splitting.cpp":"2edc79cc13f3177934e0443ad62f5976a1991f01f86ea303a803434849b13a47","glsl-optimizer/src/compiler/glsl/opt_swizzle.cpp":"015d0abddfe507f67c4b96c82988d861d018ededf7bf055e2bcbe9ea92da694e","glsl-optimizer/src/compiler/glsl/opt_tree_grafting.cpp":"46d28ac983ea244a4315bdc0e8892979ec4d1f9b9a96ac8a8a08006d9bc5e878","glsl-optimizer/src/compiler/glsl/opt_vectorize.cpp":"d80ee43bb97d9f016fb9c5e1e06f5b2afa569811f368ba067be794ec11d085fb","glsl-optimizer/src/compiler/glsl/program.h":"2982447e2abd35371e273ad87951722782a8b21c08294f67c39d987da1e1c55f","glsl-optimizer/src/compiler/glsl/propagate_invariance.cpp":"080943e21baa32494723a2eefb185915d2daae1f46d6df420145c5ad6857e119","glsl-optimizer/src/compiler/glsl/s_expression.cpp":"1ced972bc6ecc8eab4116ea71fb0212ab9ae5bcc0be3b47aa5d9d903566b3af1","glsl-optimizer/src/compiler/glsl/s_expression.h":"65b847e30e22a809b57d0bc70243049c99d9c6318803c5b8d0826aba55dc217e","glsl-optimizer/src/compiler/glsl/serialize.cpp":"be0eb4251348a9d921acb839a5c48c6023a2e9d116d602bb0432787ab623655d","glsl-optimizer/src/compiler/glsl/serialize.h":"57425732eba1233d928e5f07f88b623ce65af46b3bb034bf147f0a4b7f94f9a1","glsl-optimizer/src/compiler/glsl/shader_cache.cpp":"e0c5c433f2df3fccdf1d61281bfcb0ee5633433339b97c697d64db99611cbaaf","glsl-optimizer/src/compiler/glsl/shader_cache.h":"9217164d8d7f54aca0fe5922c7187095a6ae0cb703b196b79805aeef07a7e697","glsl-optimizer/src/compiler/glsl/standalone.cpp":"8e6c416a14d631261917a5fe4cc91880c287b22b2dfd70eb22028289a8fa5364","glsl-optimizer/src/compiler/glsl/standalone.h":"a7c397d1dfdd1e7fb2cfe99db35cd9df93251e642059208533202b7f20497f83","glsl-optimizer/src/compiler/glsl/standalone_scaffolding.cpp":"970d14b7a9d58e5270321f97bf5d57795558b1c570a56678e04a65b26c60bf4f","glsl-optimizer/src/compiler/glsl/standalone_scaffolding.h":"d921a617ea82b9e49413314492a645c44356de503581b1be3f1b57de236e480d","glsl-optimizer/src/compiler/glsl/string_to_uint_map.cpp":"d824bf5b839bd39498dc9e457103cdbe3e5289ddf7564107c27b1505948dd31f","glsl-optimizer/src/compiler/glsl/string_to_uint_map.h":"e2f18e66359c9d620e085de7f4a334a47df9c66e65a5bfe8b734c627bec04104","glsl-optimizer/src/compiler/glsl/test_optpass.h":"b27b8f35f5387e7ce4982bb51c7b63ccf14f91757f3108a5d02ed006925bb8a0","glsl-optimizer/src/compiler/glsl/xxd.py":"376484142f27f45090ea8203ae2621abf73f06175cb0ee8d96f44a3b9327f4bd","glsl-optimizer/src/compiler/glsl_types.cpp":"044bb6754f45419a3151e7a25c39202a82009ae3c6bc54ff7f0bb4258a5deefe","glsl-optimizer/src/compiler/glsl_types.h":"fd899a42f34ddeb8601bc3cd6c5e3aed82fc8aef4042dde1b39b3c01e1dcc219","glsl-optimizer/src/compiler/shader_enums.c":"436bff5216b11b0980bdfada5885fc6ac9afa2037a3027fcd6eea2a8635597ac","glsl-optimizer/src/compiler/shader_enums.h":"13220442a5c02e83540cf2c0ad4f8417b2fbda5f2586dec4e92082544c937cdd","glsl-optimizer/src/compiler/shader_info.h":"4c5453e81197ca83593ee4f365074b23530f2ab21c78e1733b63dec6f344c12a","glsl-optimizer/src/gallium/auxiliary/util/u_half.h":"3c2b37bda3ccb64387e44b723d29cf9046decab1a893bf42d842e9603398bdee","glsl-optimizer/src/gallium/include/pipe/p_compiler.h":"c75620096ce8523dae90599e50aa2ef6468d3b0e368a77795edeb20dd1abfc0c","glsl-optimizer/src/gallium/include/pipe/p_config.h":"a27692fc35f9e55df3224b7529e66b3001e911e94e6bc5f8f569e493e1ee3fb7","glsl-optimizer/src/gallium/include/pipe/p_defines.h":"be26d68c0acc67c5e44788c6299716a9eee415fd81d7d747e3738a829e3b6b38","glsl-optimizer/src/gallium/include/pipe/p_format.h":"5674215fc41d27496f037cf837717daefbf23ebb38d40ace7c0c414bc08182b0","glsl-optimizer/src/gallium/include/pipe/p_state.h":"d600593aba5f5a17072a6c38f6baa81e01c7994b0174250f7e433bb41684b702","glsl-optimizer/src/mapi/glapi/glapi.h":"73632a625c0ddabc401205e8b5a81eb8af8506868efe4b170d7979ec3619e9c5","glsl-optimizer/src/mesa/main/config.h":"5800259373099e5405de2eb52619f9de242552a479902a3a642a333c8cb3c1e7","glsl-optimizer/src/mesa/main/context.c":"2f3208473d99c94f734b1137ba91889d4a1babb9e7534bf1dc85d851ee98274e","glsl-optimizer/src/mesa/main/context.h":"cc7e4194797db9d007f01884e23d786c453b3860821f7f2ddcdf0f1bf3f8ffb1","glsl-optimizer/src/mesa/main/dd.h":"6a964acd06b6c2d88700e69fb75fe3c6b3b3d45bbc41db24f3f897a29695fe0c","glsl-optimizer/src/mesa/main/debug_output.h":"7312422e90b8c0e34028ac27280e438139b5cba525c99deb3ac883cd3d87e452","glsl-optimizer/src/mesa/main/draw.h":"7eaef3a9e27a60ea6f7937109bf3a6190b831162fde0479abb12077ce27c353d","glsl-optimizer/src/mesa/main/enums.h":"87d562a6764f51c014a2274fa7c3aca17c04441537ddd56b2554f13c6fffea92","glsl-optimizer/src/mesa/main/errors.h":"c79444b5df289c90fbb22a33b2d0c23917d9fc4510960088f0b79e53bb56b1b2","glsl-optimizer/src/mesa/main/extensions.h":"a38b2f87cc93c513994281350d69e06c84ff8eded5313ec0a1be33f375e0ebbd","glsl-optimizer/src/mesa/main/extensions_table.c":"17642d1a8c9a0bf2bd61060052d33ff14a005d2b962e6cf91465797a50851e85","glsl-optimizer/src/mesa/main/extensions_table.h":"2c879571c238d2e14461031ac740372fd0f9ac3a34c0d5541bb9b7ed4c0376c8","glsl-optimizer/src/mesa/main/formats.h":"02e2f7ec3e39286cf9f27e2641043e6df8ecb1dfde9e643313210e214af2a929","glsl-optimizer/src/mesa/main/glheader.h":"58217b33eead6aa6b23cd4a291cefeaa6cb84e465f4960daffca97c44d6d1c35","glsl-optimizer/src/mesa/main/glthread.h":"51fb2711f77e7eafcfc52d29d5b844978832b24c930d88accd48d143a6eb9c6f","glsl-optimizer/src/mesa/main/hash.h":"7e7f782034c16a8e693de48e00c31d4a90b0129f4029fd074033d7d16ccbe718","glsl-optimizer/src/mesa/main/macros.h":"73d15ddfd64f2b57b9b2ffeeb993b9c2c0899a80563e9d6ff337b11ccbe6eee5","glsl-optimizer/src/mesa/main/menums.h":"5dfac0e2279d60b0cd0c7b9fc2a5021620d0f6282ed2e738c420214e3af152d3","glsl-optimizer/src/mesa/main/mesa_private.h":"edda678b93438944279a551f663b8858ad84814a9fc88ba9672ef195599c24ae","glsl-optimizer/src/mesa/main/mtypes.h":"6efddefa099e4d2e3fdd97f0055644f47aba21711385edfeabc2d9b0676f2eec","glsl-optimizer/src/mesa/main/shaderobj.h":"9f0dfe96d0c2154201adef942bd36053533ac7b2492fb3786acda5bea514c75e","glsl-optimizer/src/mesa/main/uniforms.h":"4e331e6ad6e9cbded978b4082dbe0a57c1f8f01327446bb6892bfc179976c38b","glsl-optimizer/src/mesa/main/version.h":"9d0a13a758099302dc55cf7d045791834a89b0f9d4cf17b2692259b369a8a9a1","glsl-optimizer/src/mesa/math/m_matrix.h":"a37b19f182e070db3df93b0ede43c22fb8be8c2906504133ee6dbd7db1185d8b","glsl-optimizer/src/mesa/program/dummy_errors.c":"1820e305515b4c5e041f5e1623266a48ec8f076a155310be7d60637101f593e4","glsl-optimizer/src/mesa/program/ir_to_mesa.h":"b47f58d22e3ca2ae42d52501ea769d15c4476834944fa97eeccd3a3439211d00","glsl-optimizer/src/mesa/program/prog_instruction.h":"ab3832152a7e144b59e5a2264b2c29db56d93be31e76bbd958527a56771b40eb","glsl-optimizer/src/mesa/program/prog_parameter.h":"ba18c743284eadbc837c2c364c73e5d372321a7637a76e589d8d39fe8b5de225","glsl-optimizer/src/mesa/program/prog_statevars.h":"fc413698f84bc52d45fdeae0471934ee9904bfb7eac1a2b5f70446e54bcbbdca","glsl-optimizer/src/mesa/program/program.h":"1f01026a4eff440a3f122fd9b519d03546fe7f7d8be60dca834e95a2f8fbbfd2","glsl-optimizer/src/mesa/program/symbol_table.c":"6611cb9f078035bf5ff8c9112093a6c7d99f8af99a3931d0c07f227cc72283ea","glsl-optimizer/src/mesa/program/symbol_table.h":"631dc35ac48d5e87962d45507461920f6575610960ffcc42a08cefeb43300cda","glsl-optimizer/src/mesa/vbo/vbo.h":"6eb1dcd9a08c92f276c5fe08da184ff9d455d1be421913b8ad732a7b65e858fb","glsl-optimizer/src/util/bitscan.h":"9e49e694e6b34fe035bc685f32588827eb8cbe7d82878963c7ab52843e1c16aa","glsl-optimizer/src/util/bitset.h":"c40f78515c6230fed18345c6751ce33833a49da7a27901c7e6d7340cbdcbc5e7","glsl-optimizer/src/util/blob.c":"8f729846f66efc9c15485cc5fc24c6ec861fc1fecb2f652573f2a237d481b791","glsl-optimizer/src/util/blob.h":"93e1eaac866b9a7cd6fc03b533c18fb2edf0e97f03395eff4f3a605c4fc14d0c","glsl-optimizer/src/util/compiler.h":"79e3bf40a5bab704e6c949f23a1352759607bb57d80e5d8df2ef159755f10b68","glsl-optimizer/src/util/crc32.c":"2f3467a046b3a76784ecb9aa55d527698c8607fd0b12c622f6691aaa77b58505","glsl-optimizer/src/util/crc32.h":"59bd81865e51042b73a86f8fb117c312418df095fed2d828c5c1d1c8b6fc6cd4","glsl-optimizer/src/util/debug.c":"c3d68e9752ccc19e66c669562cd113cf1d0ac83cbb30174789e7fb8d1df58f9c","glsl-optimizer/src/util/debug.h":"50068d745c4199ccbd33d68dd4c8a36d2b5179c7869a21e75906ddd0718ca456","glsl-optimizer/src/util/detect_os.h":"343a8790d17a3710c6dd015ee367f84e3902ff3f2e36faca2bf93f9d725d3574","glsl-optimizer/src/util/disk_cache.c":"f533937e5a4fffe76e2739ef4b6b1e1da097d96d63eb808e68ebbc7027641c23","glsl-optimizer/src/util/disk_cache.h":"e83314fb14134a8e079b15e470a6376ba5a8253701f048c890a62b7e55d64bc8","glsl-optimizer/src/util/fast_urem_by_const.h":"e108fce804616c47d071dfe4a04163eec1126e448ed1aa89abb6b3a6d772bd5b","glsl-optimizer/src/util/fnv1a.h":"ab2596f19c6adf431ae27618f62c5743e24ad23ef83bb359a4c4c218245ab459","glsl-optimizer/src/util/format/u_format.h":"4cdfc0c59cbc99a092e5ec5a396910f2d93b9643e5d8141050b011e66f11e45b","glsl-optimizer/src/util/futex.h":"26f7c9d86e9ffef4c0fa2761f1aaa1918337302e20bd6ca10e61dc3c47356deb","glsl-optimizer/src/util/half_float.c":"11bc2584493d5d9d46e8c8a619a0307cf150bf5ab5d0f96bb764b061dc37a00e","glsl-optimizer/src/util/half_float.h":"7f7c380f126da1400a91758cc0392f24bf967bce1672890b62be26fe9fbd922b","glsl-optimizer/src/util/hash_table.c":"0ca40352e35dedab0a84c64c903f1b16d47e950bb5f43b4d22bb57d499bfea6e","glsl-optimizer/src/util/hash_table.h":"217191bb360592e2232f187473c10287d2cda8ae6fa5c53d0ef74c8c206118b4","glsl-optimizer/src/util/list.h":"9fab03c6a78186bb5f173269f825f6ce976b409d931852e3d93bac632e07989a","glsl-optimizer/src/util/macros.h":"63faf65b51058c483b17f1f77da51d1c53c8beab52678cb6bd01f1228a63b6b0","glsl-optimizer/src/util/mesa-sha1.c":"00c692ec353ebc02c06c57c5a71de0ab7a119f86a4146f452e65ec87e4944417","glsl-optimizer/src/util/mesa-sha1.h":"bff4c29f4bf7cdbcefb30fa0c996a7604a380eba8976467c2a60e7cd328f7e26","glsl-optimizer/src/util/mesa-sha1_test.c":"25da89a59d51469f77b4c468ca23ffdce0a7a1166a70b6cc23026a6800b0143c","glsl-optimizer/src/util/os_memory.h":"64555faf1760ae6954f42c83727c38dfc4c278e9152115779ffaad58b42adacf","glsl-optimizer/src/util/os_memory_aligned.h":"12d86fa94be38c13f7eeebdf313795e1267dd5a7187d2f0072e0e896f41702f6","glsl-optimizer/src/util/os_memory_stdc.h":"07360363b88c927065e10df71bebf6c8a0cc3b9167c9dfce55f2d65f11e6f787","glsl-optimizer/src/util/os_misc.c":"a9936e613ec84803abd59ad47c192c8e3939993c950ac91973fdc4cec1801bb8","glsl-optimizer/src/util/os_misc.h":"cc68eb12e05b5e749c54298cb4a6f4cd20cc5af7db3403e70b3c27b56090c740","glsl-optimizer/src/util/os_time.h":"73e775f7335244ff5964c678c27eedf1aea6abea44c4169d327ea8c7ce4a3a88","glsl-optimizer/src/util/ralloc.c":"4b51189595ef67bcef52c40cbf654d969041dbd15e15d4a893ad494ac060aeca","glsl-optimizer/src/util/ralloc.h":"e573c45875ff1530f0dbee9a93ae55535fdac8d5cc88a79ebc327c688824bde5","glsl-optimizer/src/util/rounding.h":"0450722353caf83de07e67f335949dbe95fe53b534052d4ee9d28d2781387614","glsl-optimizer/src/util/set.c":"86f8c9a830bead5a5a79bc970b0ff97809312af07b3beb39ef9d90af04d40a1b","glsl-optimizer/src/util/set.h":"3e39ca161e7ed4ec7c436cc9c7919ed9a55ed1b71edbf2caf6f9bcfd9bc578ed","glsl-optimizer/src/util/sha1/README":"00af7419af05247081858acb2902efd99fcda2ce16e331079f701645bb3729c0","glsl-optimizer/src/util/sha1/sha1.c":"1403bbe0aad42ba3e6be7e09f7cad87a6a8c4ad5b63962f7b92b9f37d8133b04","glsl-optimizer/src/util/sha1/sha1.h":"68d9f240eab2918026ecdf22be36811abbd4f1389f6c36e31258041aeaedd247","glsl-optimizer/src/util/simple_mtx.h":"12c6c3c4b7db9168bc656d5b3c65912075084d2b388c415d5c3d3f5953a9d6c7","glsl-optimizer/src/util/softfloat.c":"a97e51a96fe5e6a052c02aa6bbec683fe73fb88a8c087d9c930503e2120d8a2e","glsl-optimizer/src/util/softfloat.h":"66664b0250e83bf5dd4cc743acd119d076efcea624a0eab3d6b60718e6ee8811","glsl-optimizer/src/util/string_buffer.c":"63a1d1b1e34926c88ea00159cafbcd56568b805c4f64d1e8c97169fe313921fc","glsl-optimizer/src/util/string_buffer.h":"7b88d1b1d9c6cfb8e93331813535c127289437c75f822029e9a3bca8ea6b52ee","glsl-optimizer/src/util/strndup.h":"0273c4fdb7482cd7746881a63d3998648c6d63415ba85af1d1860f0e0dc504c6","glsl-optimizer/src/util/strtod.c":"5cf610d8a37373cf37cfb7aae903525d943b2674b1f32594c70b0eb19a8c9697","glsl-optimizer/src/util/strtod.h":"237396def4e264d35ed4bedea00ef9a4ceab6d7a11a18c770d9747d22c69ed2d","glsl-optimizer/src/util/u_atomic.h":"c02e809526c6c09ba8fe51f50b2490d1b6c8e5c7f3c4031ae958250d098fc3bb","glsl-optimizer/src/util/u_debug.c":"8c060e379b816618f3dd22c9ea523c68b9425c76c36a7dfe5d6d375b337f5f4a","glsl-optimizer/src/util/u_debug.h":"e11e26edd9b9e4e6f8e6a435e69f4d9edda27e9a379f68f4c82ea2525aaaea68","glsl-optimizer/src/util/u_dynarray.h":"853d0fa6ff2261614488be624deb8a2b01e57c2c8eabc28578cbeed4ccc95694","glsl-optimizer/src/util/u_endian.h":"3ccea7e529740318d8a4b05c00db3adc9d1e292a52bdc56a05c9fae99209720f","glsl-optimizer/src/util/u_math.c":"c868a8c0886dc78f1b06b13404ba8b253090449045774dd56893ac9d75795184","glsl-optimizer/src/util/u_math.h":"a04e32e126db016413f9de0a2028a3e71737137463b1289eae576f884b06fcf1","glsl-optimizer/src/util/u_memory.h":"c5db17c724c70283ddbe04165722f6988d4e0eb9aa3602ae472feff016649af9","glsl-optimizer/src/util/u_queue.h":"92930ce236c0528a98b695f5cea8c5c6aa9683beaf71a2227bdc5d33d1b21506","glsl-optimizer/src/util/u_string.h":"c5a2f4ef576d1547bda12c4ea219179fefa54414977743ac094abcaf696ef6ca","glsl-optimizer/src/util/u_thread.h":"00b708459b27f9910d18db92c18cc65cfc618ac2b3cd144e45f8640057b10d58","glsl-optimizer/src/util/xxhash.h":"2f2aff2fc6c0c929f52cf6ae7314122124c5be026d41ad1c357608383c4a37ad","src/bindings.rs":"79993db2058bde39f99ef483d02560d33b1cb882f6a552319e8b86eb6f9021e1","src/lib.rs":"04be1554cd829eb40864b06d80b491dd48117a4e3a601c7d482117f7a0391e67","wrapper.hpp":"f3ea34cc496f7d90b9bfcada3250b37b314c3524dac693b2ece9517bc7d274ac"},"package":"8ba4741358604ca0848c27ecc069d68e62e11cde81e38aac1da3c54b79ab5adf"} +\ No newline at end of file +diff --git comm/third_party/rust/minimal-lexical/.cargo-checksum.json comm/third_party/rust/minimal-lexical/.cargo-checksum.json +index bd057a45e60..66cba02bbad 100644 +--- comm/third_party/rust/minimal-lexical/.cargo-checksum.json ++++ comm/third_party/rust/minimal-lexical/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{".cargo_vcs_info.json":"e819b814dde0c854395882e9f65856c3196961ceced92eeab6ade4d350e7cccc",".github/ISSUE_TEMPLATE/bug_report.md":"cce60fa26d7e6afb7aa84755d6bc6431afe1f390823033545ac3ac9d94740b19",".github/ISSUE_TEMPLATE/custom.md":"b52f73fd67ebd71d43f36d5d1a2f3a53d1f32e126f70ccf0126900ff9f2aec3c",".github/ISSUE_TEMPLATE/documentation.md":"986b9a1421dc15af628bdff8691eeb39d92e36bedb7742d2a4d8327f6cb921a3",".github/ISSUE_TEMPLATE/feature_request.md":"e7861c6047eb39fb4dead4198c141817215839fddb43d16cb6e679417428a73e",".github/ISSUE_TEMPLATE/question.md":"75d3de186382ff882e26e1aba65b4b207cbd3822b9491cd92886fa7987a6ba23",".github/PULL_REQUEST_TEMPLATE/bug_fix.md":"8d7bfb13212e583b9cb717ec39ac2d2070d85470bdf81a32f89e91796a14efcc",".github/PULL_REQUEST_TEMPLATE/custom.md":"88e332c54fe5a52842abdc33e129fa12b0b39c1aaa78da16bc3e1ccce0f3e643",".github/PULL_REQUEST_TEMPLATE/documentation.md":"ac8bae6001c6822dc6d2334c085018c38a8f121f0c580b33b770357170a59c76",".github/workflows/Cross.yml":"51cd10949a21f4aa734a45c06021b53f81cebddcde6723e69caf39d6b7a53cc7",".github/workflows/Features.yml":"4b7182995976d3872853555e989d49be03cfacf92a6807317c01623a1de59742",".github/workflows/OSX.yml":"1ffe8ad7703afb4bc67caf52550b53095861f7290e9b1cbd9f7f7e62de82b3b4",".github/workflows/Simple.yml":"6c681d49afdf74a85757fca4d6bfce076daebbb8816409f42345c2782ba5408d",".github/workflows/Valgrind.yml":"5beae6618e643ef75a6cdc6622bb64a586f3bc956401551920716564d4f3c1fe",".gitmodules":"6976207a02c7160a3a1d076c5fae10fe4b78f58cdc0aa66ae47f3855b3c392fb","CHANGELOG":"55ebcf7ee0fd10987829a98fb9757cbc6f68c62198bc70122384bedc08de9915","CODE_OF_CONDUCT.md":"0bd67c62d204ec67cb29969aaf5aac337a77c84b318937bc2d9dc7e3fcbcdcaa","Cargo.toml":"6c485fa605a0d3de6ec0af125b67c55224515354034f990334b1a1a86988c632","LICENSE-APACHE":"8173d5c29b4f956d532781d2b86e4e30f83e6b7878dce18c919451d6ba707c90","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","LICENSE.md":"dbe1fff0fb1314b6af94f161511406275cf01c5a32441fbf24528a57a051d599","README.md":"00d521d93124e88edf58d42b3114786c0daaf437e73118eed27b3c716b7514ad","clippy.toml":"8d3aafbcf358ccf45cc148cd705f5fe71e777dabc391ed9a2bae32af73291fe8","rustfmt.toml":"ae46c79a84842907e151ca5d07e36b8d1932b61c6989465500c0f706507f42cc","src/bellerophon.rs":"bbabeccfa7a70ec314a894d968b424d1162df1b9e5e659baa1fd3a37d985fe75","src/bigint.rs":"93d3332d01bb7745bc569bc6b242c6c71c75eb78835b6a05bad91952b989daf0","src/extended_float.rs":"6040bdd49c03f11f8607b2da1703e1b7b5f57ddac9b02322c6958f9c1684496f","src/fpu.rs":"72d63bac2bbfc545128aa59dc35cfad3c553bac64bf575880775b3c4ace415bc","src/heapvec.rs":"836a49d40e5da90d195508e963d869afd78aaf9adb9cd60a0cb8f92b4e105c4f","src/lemire.rs":"100f3cb293deed0b0d1e7ca6b23152ba160f92f887f8924620b28c9ab77326db","src/lib.rs":"626dfc61992c42d4996dddcbfff5775ff2ffae44d116d2d70f6564a3209c0a9a","src/libm.rs":"ed5a3856eaa44a8a05aa123e27c2048b92ff42e4af1ef3f9fa1aff2a50190f4a","src/mask.rs":"63bcda92d14169a55ac54798f45365cef64a1aecd9625c3c3bc3deae202b2a07","src/num.rs":"dbcab14a5fe8e40e381829426dd75a7db672882592b5c4a08897a2fb6d2ae7ea","src/number.rs":"49d0880a99816ecf904fb88f607a821d6770ec270825b96e800a297ab1a01d78","src/parse.rs":"19559db67eddd17d331274cf87d6c4beeb0724dcdf859de9b8ab5995c4b8e682","src/rounding.rs":"8ba42d31618db1e6a381f8b60ffe1f9d216aaccb931b8fac5f279d8465e35cb7","src/slow.rs":"f096e7f83e8372e71568ec1724bc1c9d2c67ca39b80290ba062e60ae94b1f8d1","src/stackvec.rs":"0c921eb3adbd42cbe7be0f363e08ac85b6d5f1dabd4a7b077becddeff731da16","src/table.rs":"e4288891e9b1d8ba60dcc73edc639754cc2351d3219df8c625e694f3f0e58c5a","src/table_bellerophon.rs":"a2102292b27223a81e60a8a6607c42587efde3424526156921167742a0d5937c","src/table_lemire.rs":"c101c353c38b594f5b8987263b759927095b5dcd72e65607cc1c6a7de0bfd0c8","src/table_small.rs":"61b00e13eb3945622bf8bed374c88e29c63dfedb7384b31b35dd4e543cbe62c1","tests/bellerophon.rs":"b17b87b8963ebcd71f684e4d48c1ce619964e4fb719a5875b0ce4514ed528674","tests/bellerophon_tests.rs":"76b71efa2f4cec56a79535e2d292788a5e1b443c901ec7a234800782f36ddb68","tests/integration_tests.rs":"ed1a1fc46fc239eb4ea718057ad6e9869f633797ef72fc6f05b1757ab80e1641","tests/lemire_tests.rs":"6213bcd9b44def655b44a6b760cee0c0ad82d3bb494f48c2ff100698da34625b","tests/libm_tests.rs":"6941e74d7d0adf021edc93b9919275e82810687ff33147a10361613073b22669","tests/mask_tests.rs":"8c2a3daf434815389b6bf88837e3f382d74d97250104b925d70779366bd3d537","tests/number_tests.rs":"df4b4f0c65478f2f6193bd918fa4aad7163e40598c58df44547c4559e4a8b0c7","tests/parse_tests.rs":"bc0066b9257368f0365276fcffa2662c4699a033eaf9a4a7d6faa0e9b915094a","tests/rounding_tests.rs":"99f38b768ad15e726559c446825f9f1bad67935cdd28ffcc1cbcd3e031a901ea","tests/slow_tests.rs":"36c4c2538d2f5a1c1af5deb26ec4eba47f19f9a3c280a13d10704267a16d3b3f","tests/stackvec.rs":"f040611995bcd1bd2cb47694e74aa02ff4fabdffe007f712c9bb788d82dfb8a7","tests/vec_tests.rs":"09b561160df3b1385876db452bb5a67ef2c9fd2cc36b5687e1dfaf8c58947782"},"package":"68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"} +\ No newline at end of file ++{"files":{".cargo_vcs_info.json":"e819b814dde0c854395882e9f65856c3196961ceced92eeab6ade4d350e7cccc",".github/ISSUE_TEMPLATE/bug_report.md":"cce60fa26d7e6afb7aa84755d6bc6431afe1f390823033545ac3ac9d94740b19",".github/ISSUE_TEMPLATE/custom.md":"b52f73fd67ebd71d43f36d5d1a2f3a53d1f32e126f70ccf0126900ff9f2aec3c",".github/ISSUE_TEMPLATE/documentation.md":"986b9a1421dc15af628bdff8691eeb39d92e36bedb7742d2a4d8327f6cb921a3",".github/ISSUE_TEMPLATE/feature_request.md":"e7861c6047eb39fb4dead4198c141817215839fddb43d16cb6e679417428a73e",".github/ISSUE_TEMPLATE/question.md":"75d3de186382ff882e26e1aba65b4b207cbd3822b9491cd92886fa7987a6ba23",".github/PULL_REQUEST_TEMPLATE/bug_fix.md":"8d7bfb13212e583b9cb717ec39ac2d2070d85470bdf81a32f89e91796a14efcc",".github/PULL_REQUEST_TEMPLATE/custom.md":"88e332c54fe5a52842abdc33e129fa12b0b39c1aaa78da16bc3e1ccce0f3e643",".github/PULL_REQUEST_TEMPLATE/documentation.md":"ac8bae6001c6822dc6d2334c085018c38a8f121f0c580b33b770357170a59c76",".github/workflows/Cross.yml":"51cd10949a21f4aa734a45c06021b53f81cebddcde6723e69caf39d6b7a53cc7",".github/workflows/Features.yml":"4b7182995976d3872853555e989d49be03cfacf92a6807317c01623a1de59742",".github/workflows/OSX.yml":"1ffe8ad7703afb4bc67caf52550b53095861f7290e9b1cbd9f7f7e62de82b3b4",".github/workflows/Simple.yml":"6c681d49afdf74a85757fca4d6bfce076daebbb8816409f42345c2782ba5408d",".github/workflows/Valgrind.yml":"5beae6618e643ef75a6cdc6622bb64a586f3bc956401551920716564d4f3c1fe","CHANGELOG":"55ebcf7ee0fd10987829a98fb9757cbc6f68c62198bc70122384bedc08de9915","CODE_OF_CONDUCT.md":"0bd67c62d204ec67cb29969aaf5aac337a77c84b318937bc2d9dc7e3fcbcdcaa","Cargo.toml":"6c485fa605a0d3de6ec0af125b67c55224515354034f990334b1a1a86988c632","LICENSE-APACHE":"8173d5c29b4f956d532781d2b86e4e30f83e6b7878dce18c919451d6ba707c90","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","LICENSE.md":"dbe1fff0fb1314b6af94f161511406275cf01c5a32441fbf24528a57a051d599","README.md":"00d521d93124e88edf58d42b3114786c0daaf437e73118eed27b3c716b7514ad","clippy.toml":"8d3aafbcf358ccf45cc148cd705f5fe71e777dabc391ed9a2bae32af73291fe8","rustfmt.toml":"ae46c79a84842907e151ca5d07e36b8d1932b61c6989465500c0f706507f42cc","src/bellerophon.rs":"bbabeccfa7a70ec314a894d968b424d1162df1b9e5e659baa1fd3a37d985fe75","src/bigint.rs":"93d3332d01bb7745bc569bc6b242c6c71c75eb78835b6a05bad91952b989daf0","src/extended_float.rs":"6040bdd49c03f11f8607b2da1703e1b7b5f57ddac9b02322c6958f9c1684496f","src/fpu.rs":"72d63bac2bbfc545128aa59dc35cfad3c553bac64bf575880775b3c4ace415bc","src/heapvec.rs":"836a49d40e5da90d195508e963d869afd78aaf9adb9cd60a0cb8f92b4e105c4f","src/lemire.rs":"100f3cb293deed0b0d1e7ca6b23152ba160f92f887f8924620b28c9ab77326db","src/lib.rs":"626dfc61992c42d4996dddcbfff5775ff2ffae44d116d2d70f6564a3209c0a9a","src/libm.rs":"ed5a3856eaa44a8a05aa123e27c2048b92ff42e4af1ef3f9fa1aff2a50190f4a","src/mask.rs":"63bcda92d14169a55ac54798f45365cef64a1aecd9625c3c3bc3deae202b2a07","src/num.rs":"dbcab14a5fe8e40e381829426dd75a7db672882592b5c4a08897a2fb6d2ae7ea","src/number.rs":"49d0880a99816ecf904fb88f607a821d6770ec270825b96e800a297ab1a01d78","src/parse.rs":"19559db67eddd17d331274cf87d6c4beeb0724dcdf859de9b8ab5995c4b8e682","src/rounding.rs":"8ba42d31618db1e6a381f8b60ffe1f9d216aaccb931b8fac5f279d8465e35cb7","src/slow.rs":"f096e7f83e8372e71568ec1724bc1c9d2c67ca39b80290ba062e60ae94b1f8d1","src/stackvec.rs":"0c921eb3adbd42cbe7be0f363e08ac85b6d5f1dabd4a7b077becddeff731da16","src/table.rs":"e4288891e9b1d8ba60dcc73edc639754cc2351d3219df8c625e694f3f0e58c5a","src/table_bellerophon.rs":"a2102292b27223a81e60a8a6607c42587efde3424526156921167742a0d5937c","src/table_lemire.rs":"c101c353c38b594f5b8987263b759927095b5dcd72e65607cc1c6a7de0bfd0c8","src/table_small.rs":"61b00e13eb3945622bf8bed374c88e29c63dfedb7384b31b35dd4e543cbe62c1","tests/bellerophon.rs":"b17b87b8963ebcd71f684e4d48c1ce619964e4fb719a5875b0ce4514ed528674","tests/bellerophon_tests.rs":"76b71efa2f4cec56a79535e2d292788a5e1b443c901ec7a234800782f36ddb68","tests/integration_tests.rs":"ed1a1fc46fc239eb4ea718057ad6e9869f633797ef72fc6f05b1757ab80e1641","tests/lemire_tests.rs":"6213bcd9b44def655b44a6b760cee0c0ad82d3bb494f48c2ff100698da34625b","tests/libm_tests.rs":"6941e74d7d0adf021edc93b9919275e82810687ff33147a10361613073b22669","tests/mask_tests.rs":"8c2a3daf434815389b6bf88837e3f382d74d97250104b925d70779366bd3d537","tests/number_tests.rs":"df4b4f0c65478f2f6193bd918fa4aad7163e40598c58df44547c4559e4a8b0c7","tests/parse_tests.rs":"bc0066b9257368f0365276fcffa2662c4699a033eaf9a4a7d6faa0e9b915094a","tests/rounding_tests.rs":"99f38b768ad15e726559c446825f9f1bad67935cdd28ffcc1cbcd3e031a901ea","tests/slow_tests.rs":"36c4c2538d2f5a1c1af5deb26ec4eba47f19f9a3c280a13d10704267a16d3b3f","tests/stackvec.rs":"f040611995bcd1bd2cb47694e74aa02ff4fabdffe007f712c9bb788d82dfb8a7","tests/vec_tests.rs":"09b561160df3b1385876db452bb5a67ef2c9fd2cc36b5687e1dfaf8c58947782"},"package":"68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"} +\ No newline at end of file +diff --git comm/third_party/rust/sfv/.cargo-checksum.json comm/third_party/rust/sfv/.cargo-checksum.json +index 4ee8844eeff..b6ce2f8a232 100644 +--- comm/third_party/rust/sfv/.cargo-checksum.json ++++ comm/third_party/rust/sfv/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{".cargo_vcs_info.json":"b9684495aca1266d529c68c734a6d522edfac6963a375cc8e83ead6cba32cdd2",".gitmodules":"caa4f75b6a87c4a0f2e7d8d0d5fa2ef3f726fb0ae7797af09bfa3d57c4721148","Cargo.lock":"c2f5099c842414259cd42c41aad1625b6d8bb3448ea9005d0029b1ba473cf8df","Cargo.toml":"27657a45f07f7f9251288569bdc650aea15b875cccdd68f6add9e7a9f24cb2aa","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5318787a14e32720b1652f08a24408aaea67fdb5154ceda0f46a6069a0c5e5e3","README.md":"ce7479ab0666eeba0a0ce519e892bc9a028fbac8ea2c476ee84a486a2517f209","examples/priority.rs":"444fcbd3f3178c51c53c5c41c966e847f9cba27935508444be8fc104b1d56b8c","rustfmt.toml":"9886f841ea5c4467bb451643df62c2e95974f7c903870faa7d211b8f7b75cfc8","src/date.rs":"eeb9959d4d667ace02e3f56c97762aad5a3b86c64bd3efb75990fbc3de503847","src/decimal.rs":"478e5d3be92be19834656c34204b9e98a181179678b7ec42cbd6fa331047c442","src/error.rs":"ce11936be379aa4d487f0200675798f3c17fff556730d879050e4bc7180a4d89","src/integer.rs":"d60c007557a15e7d62862bdfb4c806472dd2fa799b1fdda46dfdf329b52dbb25","src/key.rs":"1568c93a03fdcee53c73447b998cd7c11bc3b8ab6ec981ad783855d45e2c3c86","src/lib.rs":"4543a40b4c6b3da629028f46bf5fab87845f0d52953392565b31d904c3db4985","src/parsed.rs":"4b0b2e7f6809f9c1f1ab08aa77dd9ebaf036815d4d2aa521f5bb9547ae56fb23","src/parser.rs":"8071dbccb02565cbe574b652d10c19bf59672b55dc2fc009bd658bcf1ff49e05","src/ref_serializer.rs":"37e826559f97ae232c4c6431249821803934201c43709f07e9b7a9c0cca0abea","src/serializer.rs":"3e19248a01a024f1bfafac35ee57a4d4d49a728f02a8a1ec4f836057abd1e574","src/string.rs":"7309666153042191347941d2fbcc203af3405b394e9d772520bae4434b783e48","src/test_decimal.rs":"f0b51f0b29f4aaf9d0630bb7e60655ba1678b0fa99f40513cb47c09180d642d1","src/test_integer.rs":"4976524a4dc865c4b5dbba2b897a413fdb0ecdd0e31db84e99f5076f59b07515","src/test_key.rs":"836b2b8b450366857690e4ade99888174665494e7bb953ccad5d5d2d707fb870","src/test_parser.rs":"2aedb05d9a7a7867ca0a095a8c5b431835ddac7dca358ac988779d6157b89ae5","src/test_ref_serializer.rs":"a304442ecbba16f1e55660d773c1c1efbb34115dec23619e2e23f870800d263a","src/test_serializer.rs":"f375cbed5b1048844d12d97cc06a21c0f2a7e31bf0537d670c43422bcc3269ea","src/test_string.rs":"4c8c428dabee2c205397b874e279203b11daebe6b506ce69bad75e06c304a044","src/test_token.rs":"8a0be15b72debbe14e02c93366f738f826619fd19b0a7281ac0e86c81eb7963b","src/token.rs":"a73f6b89a6e9e60c30b6d43e8a0d7b0412adb6d77c9f5ce0481e8eb7ad846b43","src/utils.rs":"b42aeaccc1221510b3943aa3145eaaff4841afc1a16ded54d8bae4fd86a8a1db","src/visitor.rs":"9f725c8d659374691c7edb6652de14789637965c1db776b5e668226dba5cd3e8"},"package":"0d471eaefb14f4b30032525bdb124b36e55ba9cb1292080e06f1a236cd10fe87"} +\ No newline at end of file ++{"files":{".cargo_vcs_info.json":"b9684495aca1266d529c68c734a6d522edfac6963a375cc8e83ead6cba32cdd2","Cargo.lock":"c2f5099c842414259cd42c41aad1625b6d8bb3448ea9005d0029b1ba473cf8df","Cargo.toml":"27657a45f07f7f9251288569bdc650aea15b875cccdd68f6add9e7a9f24cb2aa","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5318787a14e32720b1652f08a24408aaea67fdb5154ceda0f46a6069a0c5e5e3","README.md":"ce7479ab0666eeba0a0ce519e892bc9a028fbac8ea2c476ee84a486a2517f209","examples/priority.rs":"444fcbd3f3178c51c53c5c41c966e847f9cba27935508444be8fc104b1d56b8c","rustfmt.toml":"9886f841ea5c4467bb451643df62c2e95974f7c903870faa7d211b8f7b75cfc8","src/date.rs":"eeb9959d4d667ace02e3f56c97762aad5a3b86c64bd3efb75990fbc3de503847","src/decimal.rs":"478e5d3be92be19834656c34204b9e98a181179678b7ec42cbd6fa331047c442","src/error.rs":"ce11936be379aa4d487f0200675798f3c17fff556730d879050e4bc7180a4d89","src/integer.rs":"d60c007557a15e7d62862bdfb4c806472dd2fa799b1fdda46dfdf329b52dbb25","src/key.rs":"1568c93a03fdcee53c73447b998cd7c11bc3b8ab6ec981ad783855d45e2c3c86","src/lib.rs":"4543a40b4c6b3da629028f46bf5fab87845f0d52953392565b31d904c3db4985","src/parsed.rs":"4b0b2e7f6809f9c1f1ab08aa77dd9ebaf036815d4d2aa521f5bb9547ae56fb23","src/parser.rs":"8071dbccb02565cbe574b652d10c19bf59672b55dc2fc009bd658bcf1ff49e05","src/ref_serializer.rs":"37e826559f97ae232c4c6431249821803934201c43709f07e9b7a9c0cca0abea","src/serializer.rs":"3e19248a01a024f1bfafac35ee57a4d4d49a728f02a8a1ec4f836057abd1e574","src/string.rs":"7309666153042191347941d2fbcc203af3405b394e9d772520bae4434b783e48","src/test_decimal.rs":"f0b51f0b29f4aaf9d0630bb7e60655ba1678b0fa99f40513cb47c09180d642d1","src/test_integer.rs":"4976524a4dc865c4b5dbba2b897a413fdb0ecdd0e31db84e99f5076f59b07515","src/test_key.rs":"836b2b8b450366857690e4ade99888174665494e7bb953ccad5d5d2d707fb870","src/test_parser.rs":"2aedb05d9a7a7867ca0a095a8c5b431835ddac7dca358ac988779d6157b89ae5","src/test_ref_serializer.rs":"a304442ecbba16f1e55660d773c1c1efbb34115dec23619e2e23f870800d263a","src/test_serializer.rs":"f375cbed5b1048844d12d97cc06a21c0f2a7e31bf0537d670c43422bcc3269ea","src/test_string.rs":"4c8c428dabee2c205397b874e279203b11daebe6b506ce69bad75e06c304a044","src/test_token.rs":"8a0be15b72debbe14e02c93366f738f826619fd19b0a7281ac0e86c81eb7963b","src/token.rs":"a73f6b89a6e9e60c30b6d43e8a0d7b0412adb6d77c9f5ce0481e8eb7ad846b43","src/utils.rs":"b42aeaccc1221510b3943aa3145eaaff4841afc1a16ded54d8bae4fd86a8a1db","src/visitor.rs":"9f725c8d659374691c7edb6652de14789637965c1db776b5e668226dba5cd3e8"},"package":"0d471eaefb14f4b30032525bdb124b36e55ba9cb1292080e06f1a236cd10fe87"} +\ No newline at end of file +diff --git comm/third_party/rust/wasi/.cargo-checksum.json comm/third_party/rust/wasi/.cargo-checksum.json +index 283fa57969e..a912a647b90 100644 +--- comm/third_party/rust/wasi/.cargo-checksum.json ++++ comm/third_party/rust/wasi/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{".cargo_vcs_info.json":"def0d209896816fde9013e069a564dd3c1a1a46c5ce465d755b878de811f9881",".github/workflows/main.yml":"d38da3f640abbc358cb77a3c27344e9644d472adf7f8e265d00ff49d89226068",".gitmodules":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","CODE_OF_CONDUCT.md":"a13aaaf393818bd91207c618724d3fb74944ca5161201822a84af951bcf655ef","CONTRIBUTING.md":"2c908a3e263dc35dfed131c02ff907cd72fafb2c2096e4ba9b1e0cbb7a1b76df","Cargo.lock":"8cc81d2623344bdc9223c5e4a0530ae94dfa0930d465193719e6d300e2243225","Cargo.toml":"f43ee004589d9330d76d998fe7d9dd88ffd2a3daf5872b60fcaa495f47b02583","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-Apache-2.0_WITH_LLVM-exception":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","ORG_CODE_OF_CONDUCT.md":"a62b69bf86e605ee1bcbb2f0a12ba79e4cebb6983a7b6491949750aecc4f2178","README.md":"aab21c6fad2ca7e2b487764f49018ac8f6f0bf0236dabf5aa947e134952a1c69","SECURITY.md":"4d75afb09dd28eb5982e3a1f768ee398d90204669ceef3240a16b31dcf04148a","ci/regenerate.sh":"2af2cc4f41022d09ce3132013b6a0de7d5ed6fecdb44ad98b1bbd7125643cec8","ci/vendor-wit.sh":"6ea63164316554fa60fc32243595dc79629953cfb63d973678dc715b3b3cd61e","examples/cli-command-no_std.rs":"f03689380e305e5fe32e2582cb10af43d03244c1b343b90ec03936108d67f084","examples/cli-command.rs":"ac21e564ac6fe77c10ebaae774a7ebedeb8b6779826ae86834546cbe28eb8140","examples/hello-world-no_std.rs":"48251e32311e7bda9bc852bf48b8925912ae11d2534f4f7401e0d7dd3c5aeb16","examples/hello-world.rs":"4f9e5cdd74914fb82c6a20dd2544260b8d7dac921f1e0d933ca272c1ffca5163","examples/http-proxy-no_std.rs":"4ec8e31010526ffb68d2b18fd7c31a32de4d58229604efd391d4a296fee22da0","examples/http-proxy.rs":"c52c07f36d3e856bbe4e72bdd484c4129d55f26436cf0631003e451f5322d678","src/bindings.rs":"9db6b925a72119137dbc306687aa6dc61f402ed0b726db7fdb1d7fe9bf893909","src/command.rs":"8e5475c6d4a41ea3b3ec98a918a61bce9dd58cf50a2a27c764bf9796b9cbf299","src/ext/mod.rs":"4bc79c71442ac6c55dc4f8a0632b6d6805c0c9c74b22b56791a483ae447dac0c","src/ext/std.rs":"c35fd8bdafd24a6adef4f5a27e8e4bb421b0e50cebfe350868ded43980b1a06e","src/lib.rs":"044e0df592d1159ce711f17bc27edc87f876951bd3ec1ce72ebabf20e011e84a","src/proxy.rs":"3a05d33e98936642a84c755e8f4db7c5b8de27ed0416614cf4fad8b48c519cdf","wit/deps/cli/command.wit":"f729a20e99a4601f90677e31a16e63f24ee32eef062b9305e94419428c8ff70b","wit/deps/cli/environment.wit":"5e58cd47b162e9f004bc9224a29c2ec3cf9e1a3d4c910154ce53742f828af91f","wit/deps/cli/exit.wit":"a0fae6014751dc95f45b1dbe530b7f4db99d5bd607ed8bbf879b22a906f4514c","wit/deps/cli/imports.wit":"a576c17e15ece40fe29eaeb73f416d6f46ac639f512d51ad20bb915b4686a4dd","wit/deps/cli/run.wit":"a7df5376da8230e0509fffbb8355641af0765cc5cff8064bbe58fef1cbbe63c1","wit/deps/cli/stdio.wit":"bc6e5e55963d9c49b91d9880d8e50e44a718c5a7b7211bb8cb5d4fcd552b13a8","wit/deps/cli/terminal.wit":"fc87cd0bc3f76ff7181d3666617a38ee10239f8e0344db2a52cb79f46c6b2d31","wit/deps/clocks/monotonic-clock.wit":"ab12521f4522c7bae48fb272fc90f7bf21f83bc3e6b86e400075826628fdcf23","wit/deps/clocks/timezone.wit":"aaabf8145758aa75222a5e18de29a912d5ebb5babc348884fd81b1fa90225adc","wit/deps/clocks/wall-clock.wit":"b7b63d7bbb6631bcc8ce7d25910d47308e6345104dc146513b76ff1d82e1d7a0","wit/deps/clocks/world.wit":"5f066526b320973195e083bc946874b36fc488f8ae5004119c9b5dcd83430660","wit/deps/filesystem/preopens.wit":"1c53bbc639e87efc67440332e186bcc617f1ab0f2a9789c339a69ed0da424358","wit/deps/filesystem/types.wit":"24413900954e7ca1438f3c9b326a6f799b748beab51a297ab687003578f66765","wit/deps/filesystem/world.wit":"70f31a63ada7aeb6be29380aae712406baf91dad72e73de39025e38f41a32cae","wit/deps/http/handler.wit":"1f66174b4058b102367e69ce8aa657b3e9dbc767f6ade960108faaa1731f0945","wit/deps/http/proxy.wit":"c8756768c033db884734f98858b0d448a3a2cb98d9e4584c705f1fc0418422f1","wit/deps/http/types.wit":"82ac209d799643a39309c40d108a9594bebb79312f383ffcf284f23011041e7e","wit/deps/io/error.wit":"ea8a48ed6aa970947f65e378a2e72b878b421d0594b5425349d1c033a138533f","wit/deps/io/poll.wit":"d6eafcf78f220dfc07c4f055019732cc30c526d6d0d0b24150325c5eeef5d041","wit/deps/io/streams.wit":"d4b8980637de85e47459a0144dc1a9b999bfcbfb6ab344f0eceadc5face6135b","wit/deps/io/world.wit":"5572ef45d90cd766282c171a6cc403b3b9567b73e63a413c4eba1b4ad05caf25","wit/deps/random/insecure-seed.wit":"466da73f3aa1065083dd15ffd1d55c8e69b6ec4dfc6c9c149e651a126f60f33c","wit/deps/random/insecure.wit":"0a132cde99268a502973ca112db9da45c0c32870c67d6b92bd3110636c1cd871","wit/deps/random/random.wit":"cebb42f292bada460ab424bb56caf392ad14d4d7dfae1b85dfbc55253c1b751f","wit/deps/random/world.wit":"7d825a7a1624f4a165f6c7abc9aaa77e25618a9fed0c56461df8826965920dc2","wit/deps/sockets/instance-network.wit":"1e4a5d97df44421503a169e1d514eca2cf160f545c44d320ce8a82f726a40cf8","wit/deps/sockets/ip-name-lookup.wit":"c87cc003ff2b92a0d74294418e0d62d12f42f913b94617f73cc09738a46e8fac","wit/deps/sockets/network.wit":"077f76c2f266b3211b0e3fbddf4fbfd9060be050954d44aad9b331419fbe3caf","wit/deps/sockets/tcp-create-socket.wit":"96a6a1a93b859127ee60273f0a77cda8d60930f7952174fb22469293b5da6a3a","wit/deps/sockets/tcp.wit":"ad16e21cae8b67e09f6541fafaf57c88242722871aced8e53aaf018ee63be086","wit/deps/sockets/udp-create-socket.wit":"c52b9bf91ef4e30e7ec08ad1fc9e77ef005a0a87648c5d2e416dd6e35369f08c","wit/deps/sockets/udp.wit":"b8cd7720349cf11278dd30c77799b0255bfc8cbfb2dc2a8dd333f658a88d147e","wit/deps/sockets/world.wit":"84e8071d91f63484a326b5a745728e1964edc55cc90796df7ba042b508325103","wit/wasi-crate.wit":"87b72c92cc7561d7fbedc1c268f310b476f36803890c76257ebe13c0a1c06a5d"},"package":"9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"} +\ No newline at end of file ++{"files":{".cargo_vcs_info.json":"def0d209896816fde9013e069a564dd3c1a1a46c5ce465d755b878de811f9881",".github/workflows/main.yml":"d38da3f640abbc358cb77a3c27344e9644d472adf7f8e265d00ff49d89226068","CODE_OF_CONDUCT.md":"a13aaaf393818bd91207c618724d3fb74944ca5161201822a84af951bcf655ef","CONTRIBUTING.md":"2c908a3e263dc35dfed131c02ff907cd72fafb2c2096e4ba9b1e0cbb7a1b76df","Cargo.lock":"8cc81d2623344bdc9223c5e4a0530ae94dfa0930d465193719e6d300e2243225","Cargo.toml":"f43ee004589d9330d76d998fe7d9dd88ffd2a3daf5872b60fcaa495f47b02583","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-Apache-2.0_WITH_LLVM-exception":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","ORG_CODE_OF_CONDUCT.md":"a62b69bf86e605ee1bcbb2f0a12ba79e4cebb6983a7b6491949750aecc4f2178","README.md":"aab21c6fad2ca7e2b487764f49018ac8f6f0bf0236dabf5aa947e134952a1c69","SECURITY.md":"4d75afb09dd28eb5982e3a1f768ee398d90204669ceef3240a16b31dcf04148a","ci/regenerate.sh":"2af2cc4f41022d09ce3132013b6a0de7d5ed6fecdb44ad98b1bbd7125643cec8","ci/vendor-wit.sh":"6ea63164316554fa60fc32243595dc79629953cfb63d973678dc715b3b3cd61e","examples/cli-command-no_std.rs":"f03689380e305e5fe32e2582cb10af43d03244c1b343b90ec03936108d67f084","examples/cli-command.rs":"ac21e564ac6fe77c10ebaae774a7ebedeb8b6779826ae86834546cbe28eb8140","examples/hello-world-no_std.rs":"48251e32311e7bda9bc852bf48b8925912ae11d2534f4f7401e0d7dd3c5aeb16","examples/hello-world.rs":"4f9e5cdd74914fb82c6a20dd2544260b8d7dac921f1e0d933ca272c1ffca5163","examples/http-proxy-no_std.rs":"4ec8e31010526ffb68d2b18fd7c31a32de4d58229604efd391d4a296fee22da0","examples/http-proxy.rs":"c52c07f36d3e856bbe4e72bdd484c4129d55f26436cf0631003e451f5322d678","src/bindings.rs":"9db6b925a72119137dbc306687aa6dc61f402ed0b726db7fdb1d7fe9bf893909","src/command.rs":"8e5475c6d4a41ea3b3ec98a918a61bce9dd58cf50a2a27c764bf9796b9cbf299","src/ext/mod.rs":"4bc79c71442ac6c55dc4f8a0632b6d6805c0c9c74b22b56791a483ae447dac0c","src/ext/std.rs":"c35fd8bdafd24a6adef4f5a27e8e4bb421b0e50cebfe350868ded43980b1a06e","src/lib.rs":"044e0df592d1159ce711f17bc27edc87f876951bd3ec1ce72ebabf20e011e84a","src/proxy.rs":"3a05d33e98936642a84c755e8f4db7c5b8de27ed0416614cf4fad8b48c519cdf","wit/deps/cli/command.wit":"f729a20e99a4601f90677e31a16e63f24ee32eef062b9305e94419428c8ff70b","wit/deps/cli/environment.wit":"5e58cd47b162e9f004bc9224a29c2ec3cf9e1a3d4c910154ce53742f828af91f","wit/deps/cli/exit.wit":"a0fae6014751dc95f45b1dbe530b7f4db99d5bd607ed8bbf879b22a906f4514c","wit/deps/cli/imports.wit":"a576c17e15ece40fe29eaeb73f416d6f46ac639f512d51ad20bb915b4686a4dd","wit/deps/cli/run.wit":"a7df5376da8230e0509fffbb8355641af0765cc5cff8064bbe58fef1cbbe63c1","wit/deps/cli/stdio.wit":"bc6e5e55963d9c49b91d9880d8e50e44a718c5a7b7211bb8cb5d4fcd552b13a8","wit/deps/cli/terminal.wit":"fc87cd0bc3f76ff7181d3666617a38ee10239f8e0344db2a52cb79f46c6b2d31","wit/deps/clocks/monotonic-clock.wit":"ab12521f4522c7bae48fb272fc90f7bf21f83bc3e6b86e400075826628fdcf23","wit/deps/clocks/timezone.wit":"aaabf8145758aa75222a5e18de29a912d5ebb5babc348884fd81b1fa90225adc","wit/deps/clocks/wall-clock.wit":"b7b63d7bbb6631bcc8ce7d25910d47308e6345104dc146513b76ff1d82e1d7a0","wit/deps/clocks/world.wit":"5f066526b320973195e083bc946874b36fc488f8ae5004119c9b5dcd83430660","wit/deps/filesystem/preopens.wit":"1c53bbc639e87efc67440332e186bcc617f1ab0f2a9789c339a69ed0da424358","wit/deps/filesystem/types.wit":"24413900954e7ca1438f3c9b326a6f799b748beab51a297ab687003578f66765","wit/deps/filesystem/world.wit":"70f31a63ada7aeb6be29380aae712406baf91dad72e73de39025e38f41a32cae","wit/deps/http/handler.wit":"1f66174b4058b102367e69ce8aa657b3e9dbc767f6ade960108faaa1731f0945","wit/deps/http/proxy.wit":"c8756768c033db884734f98858b0d448a3a2cb98d9e4584c705f1fc0418422f1","wit/deps/http/types.wit":"82ac209d799643a39309c40d108a9594bebb79312f383ffcf284f23011041e7e","wit/deps/io/error.wit":"ea8a48ed6aa970947f65e378a2e72b878b421d0594b5425349d1c033a138533f","wit/deps/io/poll.wit":"d6eafcf78f220dfc07c4f055019732cc30c526d6d0d0b24150325c5eeef5d041","wit/deps/io/streams.wit":"d4b8980637de85e47459a0144dc1a9b999bfcbfb6ab344f0eceadc5face6135b","wit/deps/io/world.wit":"5572ef45d90cd766282c171a6cc403b3b9567b73e63a413c4eba1b4ad05caf25","wit/deps/random/insecure-seed.wit":"466da73f3aa1065083dd15ffd1d55c8e69b6ec4dfc6c9c149e651a126f60f33c","wit/deps/random/insecure.wit":"0a132cde99268a502973ca112db9da45c0c32870c67d6b92bd3110636c1cd871","wit/deps/random/random.wit":"cebb42f292bada460ab424bb56caf392ad14d4d7dfae1b85dfbc55253c1b751f","wit/deps/random/world.wit":"7d825a7a1624f4a165f6c7abc9aaa77e25618a9fed0c56461df8826965920dc2","wit/deps/sockets/instance-network.wit":"1e4a5d97df44421503a169e1d514eca2cf160f545c44d320ce8a82f726a40cf8","wit/deps/sockets/ip-name-lookup.wit":"c87cc003ff2b92a0d74294418e0d62d12f42f913b94617f73cc09738a46e8fac","wit/deps/sockets/network.wit":"077f76c2f266b3211b0e3fbddf4fbfd9060be050954d44aad9b331419fbe3caf","wit/deps/sockets/tcp-create-socket.wit":"96a6a1a93b859127ee60273f0a77cda8d60930f7952174fb22469293b5da6a3a","wit/deps/sockets/tcp.wit":"ad16e21cae8b67e09f6541fafaf57c88242722871aced8e53aaf018ee63be086","wit/deps/sockets/udp-create-socket.wit":"c52b9bf91ef4e30e7ec08ad1fc9e77ef005a0a87648c5d2e416dd6e35369f08c","wit/deps/sockets/udp.wit":"b8cd7720349cf11278dd30c77799b0255bfc8cbfb2dc2a8dd333f658a88d147e","wit/deps/sockets/world.wit":"84e8071d91f63484a326b5a745728e1964edc55cc90796df7ba042b508325103","wit/wasi-crate.wit":"87b72c92cc7561d7fbedc1c268f310b476f36803890c76257ebe13c0a1c06a5d"},"package":"9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"} +\ No newline at end of file +diff --git comm/third_party/rust/yaml-rust2/.cargo-checksum.json comm/third_party/rust/yaml-rust2/.cargo-checksum.json +index bc11e9c2284..d71f6a0eb51 100644 +--- comm/third_party/rust/yaml-rust2/.cargo-checksum.json ++++ comm/third_party/rust/yaml-rust2/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{".cargo/config.toml":"0561dd764201cb870fb7e7a5c69462e06662b165bd5c9ef3cb249f9f1ba3d5a3",".cargo_vcs_info.json":"3dd9da8d0fa45015e7340b66aff753bbc9c7d2775e80ee528e3f4de035cee7a7",".github/renovate.json5":"d90937d0ff478041a7f0365d0ba3df4995b9fc04d415749672609f3cb8a413b9",".github/workflows/ci.yml":"36bb96e71c33ac40d135611e32354816adbeaac593c603366fb69f302ba93fae",".gitmodules":"b0a5c754159a9ef66c8cf0d8d6ee9141edf49823fe5281b0a41d09e20b504d9a",".licenses/Apache-LICENSE":"278f0e5c23f023a2f1af8d528dd5c29dc3a5ea2dd63558aa8d4f077c09e037c7",".licenses/MIT-LICENSE":"3dd30063cdb4a378736348c215cb84b78b0711ba7e39903162cae5ce71dc9757","CHANGELOG.md":"ecc8eaf37df1427c7c6c30895e8c21c348e41b3b3401d2946c1fa6ebbf36417c","Cargo.lock":"98e5cd23c6340002c2bcb1cbfacedc4280214a6b33e70e9942dcfe8e608f77ad","Cargo.toml":"695cb71a87a478964b29d8be16181ecca82275bbd0277344b18f621d4eb46d02","Cargo.toml.orig":"400d33c1955e188c38ee8be5a37ed0b600f3ab97c01bdcfe002ff285bbd75394","LICENSE":"73b58b558451168be8f0dc8e4ff2abdeb1b63ec005ad6cfe8df403558208be05","README.md":"b9a94cb458e10d087392ff9fc70ec051e1ef5db081189d7540b431eaa7ee6057","appveyor.yml":"becabe3922fd9bc72331ea1314a691898bb196b6555b4d32d20a67820c122687","examples/dump_yaml.rs":"d336e0249ad1b8237bdd8276c4cd09630c7655c95fec4f16b8e893daf93e8a51","garden.yaml":"e5b31835307c1d11bd9add455771a9ada697a7833f9cbb32c141fe181e8a4ce8","justfile":"0c58141a987e2d4f5d516e90955a371014f34d0501828878c9792079b6aaed9e","src/char_traits.rs":"fad4a25ac9a57e2865efa4e4539f290d91245aaf31cf5f7a7b0e8ae2070a1c58","src/debug.rs":"3147dd79c1ec80fd0c87b072fc0b522ef75b97b2f2339bdc1b58750aed28a294","src/emitter.rs":"22b3eff5e1f9c2db3d172e2faa15fbc021b95f5e33df2c0093f63733b385636f","src/lib.rs":"7084563aeba95f703d08b33ae84788d7eb2e78500709dd3a1975b7ab55ec7393","src/parser.rs":"d6258b26d27641163f07d83bc31aa94436f23006307909835e8d4b4f8d390cd3","src/scanner.rs":"bed2602e7db02d7cf893d1d2d2eae1bf0cb690fb832a0be905dd375304151f2e","src/yaml.rs":"62e90b190b19f524e814933fd6669ebb3c4f90268d056dca2e99d9df263d3941","tests/basic.rs":"4e0be69e4d59804bdf68cdf220f6b832422f8b15cf343712c270c7f80e94e7f3","tests/emitter.rs":"3d8bcbe894c2991b6527ae64cbd73c8cb3df910515dc543e4781c0f2f56a1b47","tests/quickcheck.rs":"e59756f7bdc57689428edce2bafdc65738545f2ff1c69799064ea72c2eea0d86","tests/scanner.rs":"489aae78ce85672f0a56d8cb48344342b4af025fea17ccde7de0315a8869fbc0","tests/spec_test.rs":"6eb3ea4469c6b4966f22884beebe08f6d253b78dc854166e4694c0fb4d4072f6","tests/spec_test.rs.inc":"544c4d483bbde2401d869c6bf3f2246d3b79fbd13686186acf008f1e19cc86f6","tests/specexamples.rs.inc":"3bec1a152b4597b0d8f4d87450bc7901a1f999ab695b3516c746a2156ab6c0a5","tests/test_round_trip.rs":"57a53f3a86d3666a3d4d172df91ccbd636f0f57c97549d773b81f9503db46473","tests/yaml-test-suite.rs":"bd3dc0bcc427ea4221e926ce0801222e24d30f628cb8dafd4163c19a1e259b36","tools/README.md":"7877161257563c0cd8ea9c959d4e254dc32c66bcf04bf1c2afa95c4ffe0c9371","tools/dump_events.rs":"c41346af2b0344e7cf793031717167ba1ebfb5f3e5710097601bd4d8e51f95d9","tools/run_bench.rs":"055a6b8271406df6ef74f7395e55320107da97dd14a7a2b4be5a762df084d811","tools/time_parse.rs":"f5d82eb29ba7ee17ed272cd61ee97b395a18c8f2ed2cd90b3c599cb2eef17935"},"package":"4ce2a4ff45552406d02501cea6c18d8a7e50228e7736a872951fe2fe75c91be7"} +\ No newline at end of file ++{"files":{".cargo/config.toml":"0561dd764201cb870fb7e7a5c69462e06662b165bd5c9ef3cb249f9f1ba3d5a3",".cargo_vcs_info.json":"3dd9da8d0fa45015e7340b66aff753bbc9c7d2775e80ee528e3f4de035cee7a7",".github/renovate.json5":"d90937d0ff478041a7f0365d0ba3df4995b9fc04d415749672609f3cb8a413b9",".github/workflows/ci.yml":"36bb96e71c33ac40d135611e32354816adbeaac593c603366fb69f302ba93fae",".licenses/Apache-LICENSE":"278f0e5c23f023a2f1af8d528dd5c29dc3a5ea2dd63558aa8d4f077c09e037c7",".licenses/MIT-LICENSE":"3dd30063cdb4a378736348c215cb84b78b0711ba7e39903162cae5ce71dc9757","CHANGELOG.md":"ecc8eaf37df1427c7c6c30895e8c21c348e41b3b3401d2946c1fa6ebbf36417c","Cargo.lock":"98e5cd23c6340002c2bcb1cbfacedc4280214a6b33e70e9942dcfe8e608f77ad","Cargo.toml":"695cb71a87a478964b29d8be16181ecca82275bbd0277344b18f621d4eb46d02","Cargo.toml.orig":"400d33c1955e188c38ee8be5a37ed0b600f3ab97c01bdcfe002ff285bbd75394","LICENSE":"73b58b558451168be8f0dc8e4ff2abdeb1b63ec005ad6cfe8df403558208be05","README.md":"b9a94cb458e10d087392ff9fc70ec051e1ef5db081189d7540b431eaa7ee6057","appveyor.yml":"becabe3922fd9bc72331ea1314a691898bb196b6555b4d32d20a67820c122687","examples/dump_yaml.rs":"d336e0249ad1b8237bdd8276c4cd09630c7655c95fec4f16b8e893daf93e8a51","garden.yaml":"e5b31835307c1d11bd9add455771a9ada697a7833f9cbb32c141fe181e8a4ce8","justfile":"0c58141a987e2d4f5d516e90955a371014f34d0501828878c9792079b6aaed9e","src/char_traits.rs":"fad4a25ac9a57e2865efa4e4539f290d91245aaf31cf5f7a7b0e8ae2070a1c58","src/debug.rs":"3147dd79c1ec80fd0c87b072fc0b522ef75b97b2f2339bdc1b58750aed28a294","src/emitter.rs":"22b3eff5e1f9c2db3d172e2faa15fbc021b95f5e33df2c0093f63733b385636f","src/lib.rs":"7084563aeba95f703d08b33ae84788d7eb2e78500709dd3a1975b7ab55ec7393","src/parser.rs":"d6258b26d27641163f07d83bc31aa94436f23006307909835e8d4b4f8d390cd3","src/scanner.rs":"bed2602e7db02d7cf893d1d2d2eae1bf0cb690fb832a0be905dd375304151f2e","src/yaml.rs":"62e90b190b19f524e814933fd6669ebb3c4f90268d056dca2e99d9df263d3941","tests/basic.rs":"4e0be69e4d59804bdf68cdf220f6b832422f8b15cf343712c270c7f80e94e7f3","tests/emitter.rs":"3d8bcbe894c2991b6527ae64cbd73c8cb3df910515dc543e4781c0f2f56a1b47","tests/quickcheck.rs":"e59756f7bdc57689428edce2bafdc65738545f2ff1c69799064ea72c2eea0d86","tests/scanner.rs":"489aae78ce85672f0a56d8cb48344342b4af025fea17ccde7de0315a8869fbc0","tests/spec_test.rs":"6eb3ea4469c6b4966f22884beebe08f6d253b78dc854166e4694c0fb4d4072f6","tests/spec_test.rs.inc":"544c4d483bbde2401d869c6bf3f2246d3b79fbd13686186acf008f1e19cc86f6","tests/specexamples.rs.inc":"3bec1a152b4597b0d8f4d87450bc7901a1f999ab695b3516c746a2156ab6c0a5","tests/test_round_trip.rs":"57a53f3a86d3666a3d4d172df91ccbd636f0f57c97549d773b81f9503db46473","tests/yaml-test-suite.rs":"bd3dc0bcc427ea4221e926ce0801222e24d30f628cb8dafd4163c19a1e259b36","tools/README.md":"7877161257563c0cd8ea9c959d4e254dc32c66bcf04bf1c2afa95c4ffe0c9371","tools/dump_events.rs":"c41346af2b0344e7cf793031717167ba1ebfb5f3e5710097601bd4d8e51f95d9","tools/run_bench.rs":"055a6b8271406df6ef74f7395e55320107da97dd14a7a2b4be5a762df084d811","tools/time_parse.rs":"f5d82eb29ba7ee17ed272cd61ee97b395a18c8f2ed2cd90b3c599cb2eef17935"},"package":"4ce2a4ff45552406d02501cea6c18d8a7e50228e7736a872951fe2fe75c91be7"} +\ No newline at end of file diff --git a/mail/thunderbird/files/patch-libwebrtc-generated b/mail/thunderbird/files/patch-libwebrtc-generated index 870dbd0fc349..78aafcf7ed70 100644 --- a/mail/thunderbird/files/patch-libwebrtc-generated +++ b/mail/thunderbird/files/patch-libwebrtc-generated @@ -1,113856 +1,104015 @@ -commit 91d5feee32ac273c405d11b7533478e125ba1b28 +commit 462d04e65b861f39087a21d6124fde12a17f17e3 Author: Christoph Moench-Tegeder -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 +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["_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 - 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": +@@ -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 - -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("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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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" 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["_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" - -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 += [ - "GLESv2", - "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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True 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" -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": -@@ -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 -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("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 +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["_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 - 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": +@@ -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 - -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("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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" 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" +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" -@@ -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 - 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": - +- 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 +64,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:c++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("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 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" + 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,86 +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 +- +- 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": -@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -129,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 - -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("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 ---- 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" - 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,87 +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 -- -- 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["_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": - -@@ -130,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": - -@@ -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 -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("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 +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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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" 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["_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" - -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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True 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" -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": -@@ -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 -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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": - -- 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": -@@ -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" -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" - ] - +- 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" -- ] -- + 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("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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" 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" +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" -@@ -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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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" 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["_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" - -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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True 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" -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": -@@ -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 -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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["WEBRTC_USE_BUILTIN_OPUS"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["WEBRTC_USE_BUILTIN_OPUS"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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" 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["_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" - -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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True 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" -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": -@@ -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 -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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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" 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["_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" - -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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True 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" -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": -@@ -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 -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("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 +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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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_OPUS_VARIABLE_COMPLEXITY"] = "0" +DEFINES["WEBRTC_POSIX"] = True DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True - 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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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 - -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("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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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_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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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_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 +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["_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 - 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": +@@ -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 - -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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 ---- third_party/libwebrtc/api/environment/environment_gn/moz.build -+++ third_party/libwebrtc/api/environment/environment_gn/moz.build + 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["_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"]: +@@ -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 - - 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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -137,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 - -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": -@@ -165,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 - -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": - -- 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("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 ---- third_party/libwebrtc/api/fec_controller_api_gn/moz.build -+++ third_party/libwebrtc/api/fec_controller_api_gn/moz.build ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + 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 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" 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["_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" - -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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True 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" -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": -@@ -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 -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("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 ---- 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" + 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 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" 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["_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"]: +@@ -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 - 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": +@@ -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 - -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 -- +@@ -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 - -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("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 ---- third_party/libwebrtc/api/field_trials_view_gn/moz.build -+++ third_party/libwebrtc/api/field_trials_view_gn/moz.build +- + 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 834d5f8de566..382075b68488 100644 +--- third_party/libwebrtc/api/field_trials_registry_gn/moz.build ++++ third_party/libwebrtc/api/field_trials_registry_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["_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" - -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["_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 +- +- 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 - -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 - +- 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": - -- 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("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 ---- 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() ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + Library("field_trials_registry_gn") +diff --git third_party/libwebrtc/api/field_trials_view_gn/moz.build third_party/libwebrtc/api/field_trials_view_gn/moz.build +index 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" 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["_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"]: +@@ -42,82 +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 - 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 += [ -- "GLESv2", -- "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": -@@ -162,82 +67,21 @@ 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": - -- 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 -- +@@ -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"] == "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("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 ---- 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" +- + 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 e5a1b83d2822..a437cb5392b2 100644 +--- third_party/libwebrtc/api/frame_transformer_factory_gn/moz.build ++++ third_party/libwebrtc/api/frame_transformer_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["_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 - 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 += [ +- "GLESv2", - "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": +@@ -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" -- ] -- + 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" - ] - +- 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("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 ---- third_party/libwebrtc/api/function_view_gn/moz.build -+++ third_party/libwebrtc/api/function_view_gn/moz.build + 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 ba884e273d4b..b85c50f05417 100644 +--- third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build ++++ third_party/libwebrtc/api/frame_transformer_interface_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["_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,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 - - 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["_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 +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -130,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 - -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": -@@ -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 - -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": - -- 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("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 ---- third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build -+++ third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + Library("frame_transformer_interface_gn") +diff --git third_party/libwebrtc/api/function_view_gn/moz.build third_party/libwebrtc/api/function_view_gn/moz.build +index 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" 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["_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,86 +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 - +- 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["_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": +@@ -129,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": +@@ -157,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("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 ---- third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build -+++ third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build + 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 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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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 ---- third_party/libwebrtc/api/location_gn/moz.build -+++ third_party/libwebrtc/api/location_gn/moz.build + 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 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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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 ---- third_party/libwebrtc/api/make_ref_counted_gn/moz.build -+++ third_party/libwebrtc/api/make_ref_counted_gn/moz.build + Library("jingle_peerconnection_api_gn") +diff --git third_party/libwebrtc/api/location_gn/moz.build third_party/libwebrtc/api/location_gn/moz.build +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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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 ---- 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" - 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["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("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 ---- third_party/libwebrtc/api/metronome/metronome_gn/moz.build -+++ third_party/libwebrtc/api/metronome/metronome_gn/moz.build + 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 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" 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["_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,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 - -- 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["_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": -@@ -130,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" -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": -@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64": +@@ -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("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 ---- 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" + 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 d2036a2a6aaa..84b69c959ded 100644 +--- third_party/libwebrtc/api/media_stream_interface_gn/moz.build ++++ third_party/libwebrtc/api/media_stream_interface_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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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" 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["_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"]: +@@ -42,86 +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 - 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": +@@ -129,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 - -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 -- +@@ -157,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"] == "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("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 ---- third_party/libwebrtc/api/neteq/delay_manager_api_gn/moz.build -+++ third_party/libwebrtc/api/neteq/delay_manager_api_gn/moz.build +- + 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 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 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - - 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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -137,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 - -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": -@@ -165,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 - -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": - -- 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("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 ---- 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() ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 ---- third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build -+++ third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build + 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 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" 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["_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" - -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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True 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" -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": -@@ -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 -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("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 ---- 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" + 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 1afebecfa713..e6cae2901777 100644 +--- third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build ++++ third_party/libwebrtc/api/neteq/neteq_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 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["_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,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 - 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": -@@ -154,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" -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("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 ---- third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build -+++ third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build + 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 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" 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["_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,93 +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 - +- 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["_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 +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -126,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" -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": +@@ -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 - -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("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 ---- 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" + 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 ce574f703e85..f63d71206fa2 100644 +--- third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build ++++ third_party/libwebrtc/api/neteq/tick_timer_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["_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 - 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": +@@ -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 - -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("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 ---- third_party/libwebrtc/api/ref_count_gn/moz.build -+++ third_party/libwebrtc/api/ref_count_gn/moz.build + 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 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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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 ---- third_party/libwebrtc/api/refcountedbase_gn/moz.build -+++ third_party/libwebrtc/api/refcountedbase_gn/moz.build + 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 bf2fa1665e7e..1048dc991346 100644 +--- third_party/libwebrtc/api/priority_gn/moz.build ++++ third_party/libwebrtc/api/priority_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["_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("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 ---- 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" - 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"]: +@@ -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 - 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": +@@ -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 - -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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + Library("priority_gn") +diff --git third_party/libwebrtc/api/ref_count_gn/moz.build third_party/libwebrtc/api/ref_count_gn/moz.build +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" 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["_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"]: +@@ -42,82 +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 - 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": -@@ -162,82 +68,21 @@ 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": - -- 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 -- +@@ -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"] == "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("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 ---- 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" +- + Library("ref_count_gn") +diff --git third_party/libwebrtc/api/refcountedbase_gn/moz.build third_party/libwebrtc/api/refcountedbase_gn/moz.build +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" 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["_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"]: +@@ -42,82 +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 - 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": +@@ -125,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 - -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 -- +@@ -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"] == "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("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 ---- 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" +- + Library("refcountedbase_gn") +diff --git third_party/libwebrtc/api/rtc_error_gn/moz.build third_party/libwebrtc/api/rtc_error_gn/moz.build +index 8a09b2f6a451..4cd767026bc4 100644 +--- third_party/libwebrtc/api/rtc_error_gn/moz.build ++++ third_party/libwebrtc/api/rtc_error_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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 ---- third_party/libwebrtc/api/rtp_packet_sender_gn/moz.build -+++ third_party/libwebrtc/api/rtp_packet_sender_gn/moz.build + 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 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 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -47,93 +56,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["_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 +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -141,82 +64,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": -@@ -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 - -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": - -- 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("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 ---- 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() ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + Library("rtc_event_log_gn") +diff --git third_party/libwebrtc/api/rtp_headers_gn/moz.build third_party/libwebrtc/api/rtp_headers_gn/moz.build +index fb46ff525fa5..4f0061742b36 100644 +--- third_party/libwebrtc/api/rtp_headers_gn/moz.build ++++ third_party/libwebrtc/api/rtp_headers_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["_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"]: +@@ -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 - 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": -@@ -155,82 +68,21 @@ 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["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("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 ---- third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build -+++ third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build + 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 3a7abf97f0ae..462e922c57e9 100644 +--- third_party/libwebrtc/api/rtp_packet_info_gn/moz.build ++++ third_party/libwebrtc/api/rtp_packet_info_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["_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" - -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["_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 +- +- 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 - -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 - +- 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": - -- 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("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 ---- 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() ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + 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 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" 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["_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"]: +@@ -42,82 +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 - 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": +@@ -125,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 - -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 -- +@@ -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"] == "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("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 ---- third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build -+++ third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build +- + 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 4abaae2609eb..8228db31aa88 100644 +--- third_party/libwebrtc/api/rtp_parameters_gn/moz.build ++++ third_party/libwebrtc/api/rtp_parameters_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["_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"]: +@@ -47,86 +56,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["_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": +@@ -134,82 +64,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": -@@ -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 - -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": - -- 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("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 ---- third_party/libwebrtc/api/scoped_refptr_gn/moz.build -+++ third_party/libwebrtc/api/scoped_refptr_gn/moz.build ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + 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 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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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 ---- third_party/libwebrtc/api/sequence_checker_gn/moz.build -+++ third_party/libwebrtc/api/sequence_checker_gn/moz.build + 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 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 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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,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 - - 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["_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 +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -130,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 - -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": -@@ -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 - -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": - -- 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("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 ---- 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 ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + 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 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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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 ---- 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" + 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 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" 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["_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,82 +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 - 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": +@@ -125,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 - -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 -- +@@ -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"] == "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("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 ---- 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" +- + 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 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" 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["_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,86 +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 - 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": +@@ -129,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 - -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 -- +@@ -157,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"] == "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("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 ---- third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build -+++ third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build +- + 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 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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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 ---- third_party/libwebrtc/api/transport/bandwidth_usage_gn/moz.build -+++ third_party/libwebrtc/api/transport/bandwidth_usage_gn/moz.build + 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 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 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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" - -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["_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": +@@ -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 - -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 - +- 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": - -- 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("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 ---- 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() ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + Library("pending_task_safety_flag_gn") +diff --git third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build +index 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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,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 - 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": -- -- CXXFLAGS += [ -- "-std=gnu++20" +- 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": - -- 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": -@@ -150,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" -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("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 ---- third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build -+++ third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build + Library("task_queue_gn") +diff --git third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build +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" 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["_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" - -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["_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 -- -- 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" -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": -@@ -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 -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("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 ---- third_party/libwebrtc/api/transport/ecn_marking_gn/moz.build -+++ third_party/libwebrtc/api/transport/ecn_marking_gn/moz.build + 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 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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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" + 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 1f1d1c4c736a..ce48d9240524 100644 +--- third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build ++++ third_party/libwebrtc/api/transport/bitrate_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["_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,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 - 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": +@@ -129,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 += [ "-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("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("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 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" 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["_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"]: +@@ -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 - 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 += [ -- "GLESv2", - "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": -@@ -162,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 - -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 -- +@@ -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 - -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("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("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 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" 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["_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"]: +@@ -42,82 +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 - 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": +@@ -125,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 - -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 -- +@@ -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"] == "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("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("ecn_marking_gn") +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 +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["_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,94 +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 += [ +- "GLESv2", - "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["_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 +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -130,25 +59,10 @@ 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": -@@ -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 - -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": - -- 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("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 +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["_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,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 - 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": -@@ -154,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" -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("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("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 +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["_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"]: +@@ -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["_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 -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -137,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 - -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": -@@ -165,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 - -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": - -- 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("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 ++ DEFINES["WEBRTC_ENABLE_AVX2"] = 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 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 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["_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" - -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["_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": +@@ -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 - -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 - +- 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": - -- 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("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 +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["_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 - 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": -@@ -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 - -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 -- +@@ -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 - -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("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("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 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["_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,82 +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 - 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": +@@ -125,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 - -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 -- +@@ -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"] == "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("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("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 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["_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 - 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": +@@ -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 - -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("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("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 +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["_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 - 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": +@@ -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 - -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("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("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 +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["_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 - 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": +@@ -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 - -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("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("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 +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["_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 - 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": +@@ -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 - -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("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("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 +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["_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,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 - 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 += [ -- "GLESv2", - "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": -@@ -162,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" -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" -- ] -- + 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" - ] - +- 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("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("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 +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["_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" - -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["_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": +@@ -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 - -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 - +- 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": - -- 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") -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 ---- 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() ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -+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 +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["_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 - 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 += [ +- "GLESv2", - "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": +@@ -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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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["_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"]: +@@ -42,82 +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 - 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": +@@ -125,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 - -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 -- +@@ -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"] == "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("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 ---- 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" +- + 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["_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,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 - 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 += [ -- "GLESv2", - "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": -@@ -162,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" -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" -- ] -- + 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" - ] - +- 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("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 ---- third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build -+++ third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build + 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 +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["_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"]: +@@ -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 - - 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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -137,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 - -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": -@@ -165,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 - -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": - -- 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("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 ---- third_party/libwebrtc/api/video/render_resolution_gn/moz.build -+++ third_party/libwebrtc/api/video/render_resolution_gn/moz.build ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + 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 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["_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" - -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["_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 +- +- 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 - -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 - +- 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": - -- 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("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 ---- third_party/libwebrtc/api/video/resolution_gn/moz.build -+++ third_party/libwebrtc/api/video/resolution_gn/moz.build ++ 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 f43d0c641ef3..d2b102c61127 100644 +--- third_party/libwebrtc/api/video/encoded_frame_gn/moz.build ++++ third_party/libwebrtc/api/video/encoded_frame_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["_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" - -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["_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 +- +- 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 - -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 - +- 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": - -- 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("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 ---- 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() ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + Library("encoded_frame_gn") +diff --git third_party/libwebrtc/api/video/encoded_image_gn/moz.build third_party/libwebrtc/api/video/encoded_image_gn/moz.build +index 858df454d82a..85fa5f6f2ae1 100644 +--- third_party/libwebrtc/api/video/encoded_image_gn/moz.build ++++ third_party/libwebrtc/api/video/encoded_image_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["_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,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 - 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": -@@ -154,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" -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("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 ---- 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" + 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 0e97349cfc77..068e9983902f 100644 +--- third_party/libwebrtc/api/video/frame_buffer_gn/moz.build ++++ third_party/libwebrtc/api/video/frame_buffer_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["_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 - 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 += [ +- "GLESv2", - "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": -@@ -154,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" -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("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 ---- third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build -+++ third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build + 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 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" 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["_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" - -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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True 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" -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": -@@ -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 -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("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 ---- 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" + 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 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" 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["_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,82 +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 - 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": +@@ -125,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 - -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 -- +@@ -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"] == "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("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 ---- third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build -+++ third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build +- + 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 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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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 ---- 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" + 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 6c2807380aff..ad2ccb022fdc 100644 +--- third_party/libwebrtc/api/video/video_adaptation_gn/moz.build ++++ third_party/libwebrtc/api/video/video_adaptation_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["_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"]: +@@ -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 - 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": -@@ -172,82 +78,21 @@ 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 - -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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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": -@@ -168,82 +74,21 @@ 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 - -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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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" 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["_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"]: +@@ -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 - 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": +@@ -136,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": + +@@ -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 +- +-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("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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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" +- 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": + +@@ -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 - -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" -- ] -- + 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" - ] - +- 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("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 ---- third_party/libwebrtc/api/video/video_frame_type_gn/moz.build -+++ third_party/libwebrtc/api/video/video_frame_type_gn/moz.build + 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 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" 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["_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,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 - -- 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["_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": -@@ -130,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" -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": -@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64": +@@ -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("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 ---- third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build -+++ third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build + 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 002adff7180e..22b486c49f35 100644 +--- third_party/libwebrtc/api/video/video_frame_gn/moz.build ++++ third_party/libwebrtc/api/video/video_frame_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["_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"]: +@@ -57,93 +66,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["_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": - -@@ -130,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": - -@@ -158,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("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 ---- 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" - 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" - -@@ -49,114 +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 -- 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": -@@ -164,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -151,82 +74,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" -- ] -- + 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" - ] - +- 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("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 ---- third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build -+++ third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build + 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 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 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -53,93 +62,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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -147,82 +70,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": -@@ -165,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 - -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": - -- 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("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 ---- third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build -+++ third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + 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 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 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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,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 - - 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["_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 +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -130,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 - -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": -@@ -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 - -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": - -- 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("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 ---- 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() ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + Library("video_frame_metadata_gn") +diff --git third_party/libwebrtc/api/video/video_frame_type_gn/moz.build third_party/libwebrtc/api/video/video_frame_type_gn/moz.build +index 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" 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["_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"]: +@@ -42,86 +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 - 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 += [ -- "GLESv2", - "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": -@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -129,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 - -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 -- +@@ -157,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"] == "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("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 ---- 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" +- + 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 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" 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["_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"]: +@@ -42,86 +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 - 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 += [ -- "GLESv2", - "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": -@@ -163,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -129,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 - -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 -- +@@ -157,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"] == "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("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 ---- 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" +- + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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": -@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -143,82 +66,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("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 ---- 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" + 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 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" 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["_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"]: +@@ -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 - 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": -@@ -171,82 +77,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 - -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 -- +@@ -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 - -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("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 ---- 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 +- + 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 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" 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["_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,86 +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 - - 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["_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 -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -137,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" -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": -@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64": +@@ -157,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("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 ---- 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 + 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 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 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -46,94 +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 += [ +- "GLESv2", - "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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -137,25 +59,10 @@ 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": -@@ -165,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 - -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": - -- 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("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 ---- 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 ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + 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 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 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -47,94 +56,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 += [ - "GLESv2", - "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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -142,82 +64,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": -@@ -166,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 - -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": - -- 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("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 ---- 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 ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + 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 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 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 += [ -- "GLESv2", - "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["_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 -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -138,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 - -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": -@@ -166,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 - -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": - -- 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("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 ---- 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 ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + 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 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 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -56,93 +65,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 += [ -- "GLESv2", - "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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -150,82 +73,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": -@@ -166,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 - -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": - -- 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("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 ---- 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() ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + 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 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" 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["_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"]: +@@ -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 - 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 += [ -- "GLESv2", - "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": -@@ -162,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 - -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 -- +@@ -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 - -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("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 ---- third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build -+++ third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build +- + Library("video_encoder_factory_template_gn") +diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build +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" 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["_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,94 +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 - +- OS_LIBS += [ +- "GLESv2", +- "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["_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 +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -126,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" -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": +@@ -165,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("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 ---- 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" + 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 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" 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["_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"]: +@@ -42,94 +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 - 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 += [ - "GLESv2", - "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": -@@ -174,82 +79,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -137,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 - -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 -- +@@ -165,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"] == "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("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 ---- 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" +- + 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 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" 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["_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"]: +@@ -42,94 +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 - 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 += [ +- "GLESv2", - "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": -@@ -163,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -137,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 - -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 -- +@@ -165,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"] == "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("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 ---- 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" +- + 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 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" 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["_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"]: +@@ -42,94 +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 - 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 += [ +- "GLESv2", - "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": -@@ -170,82 +76,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -137,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 - -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 -- +@@ -165,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"] == "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("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 ---- third_party/libwebrtc/call/audio_sender_interface_gn/moz.build -+++ third_party/libwebrtc/call/audio_sender_interface_gn/moz.build +- + Library("video_encoder_factory_template_open_h264_adapter_gn") +diff --git third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build +index 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 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -46,94 +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 += [ +- "GLESv2", - "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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -137,25 +59,10 @@ 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": -@@ -165,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 - -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": - -- 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("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 ---- 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() ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + Library("vp8_temporal_layers_factory_gn") +diff --git third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build +index 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" 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["_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"]: +@@ -42,82 +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 +- 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 +- 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": + +@@ -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("video_track_source_constraints_gn") +diff --git third_party/libwebrtc/audio/audio_gn/moz.build third_party/libwebrtc/audio/audio_gn/moz.build +index 61c208cfe98b..2668ec4480d4 100644 +--- third_party/libwebrtc/audio/audio_gn/moz.build ++++ third_party/libwebrtc/audio/audio_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" + +@@ -58,94 +67,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 += [ +- "GLESv2", - "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": +@@ -153,82 +75,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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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": -@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -142,82 +65,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("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 ---- 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" + 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 9c873a9f4383..97a9005397cf 100644 +--- third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build ++++ third_party/libwebrtc/call/adaptation/resource_adaptation_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["_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"]: +@@ -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 - 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 += [ -- "GLESv2", - "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": -@@ -164,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -149,82 +72,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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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" 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["_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"]: +@@ -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 - 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 += [ -- "GLESv2", - "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": -@@ -167,82 +72,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 - -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 -- +@@ -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 - -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("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 ---- third_party/libwebrtc/call/payload_type_gn/moz.build -+++ third_party/libwebrtc/call/payload_type_gn/moz.build +- + Library("audio_sender_interface_gn") +diff --git third_party/libwebrtc/call/bitrate_allocator_gn/moz.build third_party/libwebrtc/call/bitrate_allocator_gn/moz.build +index 7b8696b587d4..10a5020edb33 100644 +--- third_party/libwebrtc/call/bitrate_allocator_gn/moz.build ++++ third_party/libwebrtc/call/bitrate_allocator_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["_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"]: +@@ -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 - - 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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -137,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 - -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": -@@ -165,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 - -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": - -- 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("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 ---- 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() ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + Library("bitrate_allocator_gn") +diff --git third_party/libwebrtc/call/bitrate_configurator_gn/moz.build third_party/libwebrtc/call/bitrate_configurator_gn/moz.build +index cd5491bdefec..25c0b6e740f9 100644 +--- third_party/libwebrtc/call/bitrate_configurator_gn/moz.build ++++ third_party/libwebrtc/call/bitrate_configurator_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["_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 - 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": +@@ -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 - -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" -- ] -- + 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" - ] - +- 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("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 ---- third_party/libwebrtc/call/receive_stream_interface_gn/moz.build -+++ third_party/libwebrtc/call/receive_stream_interface_gn/moz.build + Library("bitrate_configurator_gn") +diff --git third_party/libwebrtc/call/call_gn/moz.build third_party/libwebrtc/call/call_gn/moz.build +index 4b923766e44a..72c3383fd96e 100644 +--- third_party/libwebrtc/call/call_gn/moz.build ++++ third_party/libwebrtc/call/call_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["_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"]: +@@ -48,94 +57,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 += [ +- "GLESv2", - "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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -143,82 +65,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": -@@ -165,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 - -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": - -- 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("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 ---- 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() ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + Library("call_gn") +diff --git third_party/libwebrtc/call/call_interfaces_gn/moz.build third_party/libwebrtc/call/call_interfaces_gn/moz.build +index 2b39c60732c3..e60a38eeef33 100644 +--- third_party/libwebrtc/call/call_interfaces_gn/moz.build ++++ third_party/libwebrtc/call/call_interfaces_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["_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"]: +@@ -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 - 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 += [ +- "GLESv2", - "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": +@@ -146,82 +68,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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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" 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["_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"]: +@@ -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 - 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 += [ -- "GLESv2", - "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": -@@ -164,82 +69,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 - -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 -- +@@ -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 - -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("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 ---- 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" +- + 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 71a4ce74fdb0..1efa64dbafa5 100644 +--- third_party/libwebrtc/call/payload_type_picker_gn/moz.build ++++ third_party/libwebrtc/call/payload_type_picker_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["_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"]: +@@ -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 - 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 += [ -- "GLESv2", - "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": -@@ -164,82 +69,21 @@ 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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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" 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["_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"]: +@@ -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 - 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": -- -- CXXFLAGS += [ -- "-std=gnu++20" +- 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": - -- 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": -@@ -150,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 - -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 -- +@@ -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 - -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("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 ---- 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" +- + 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 bfeb90e9822d..d9502b3458ce 100644 +--- third_party/libwebrtc/call/rtp_interfaces_gn/moz.build ++++ third_party/libwebrtc/call/rtp_interfaces_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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 53e5ed96c15c..91f237e7a432 100644 +--- third_party/libwebrtc/call/rtp_receiver_gn/moz.build ++++ third_party/libwebrtc/call/rtp_receiver_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["_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"]: +@@ -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 - 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 += [ +- "GLESv2", - "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": +@@ -143,82 +65,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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 3c344e2a71f3..34f4eee93bb4 100644 +--- third_party/libwebrtc/call/rtp_sender_gn/moz.build ++++ third_party/libwebrtc/call/rtp_sender_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_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" +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" -@@ -53,143 +63,9 @@ 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 - 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 += [ +- "GLESv2", - "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["_GNU_SOURCE"] = True - 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": + +@@ -143,82 +65,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 - +- 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" - ] - --if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": -+if CONFIG["TARGET_CPU"] == "x86": +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - 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 ---- 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 +-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("rtp_sender_gn") +diff --git third_party/libwebrtc/call/version_gn/moz.build third_party/libwebrtc/call/version_gn/moz.build +index e1d6a6a1229c..6ad8a263227e 100644 +--- third_party/libwebrtc/call/version_gn/moz.build ++++ third_party/libwebrtc/call/version_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["_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,82 +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"] == "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,30 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -129,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 - -- SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse_arm.S", -- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12_armv7.S" -- ] -- -if CONFIG["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": -@@ -159,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 - -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 -- - 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 ---- third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build -+++ third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + 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 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 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - - OS_LIBS += [ - "log" - ] - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c", -- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" -- ] -- -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 - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c", -- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" -- ] -- -if CONFIG["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 - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c", -- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" - ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -193,20 +100,14 @@ 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": - -- CFLAGS += [ +- CXXFLAGS += [ - "-mfpu=neon" -+ UNIFIED_SOURCES += [ -+ "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -+ "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c", -+ "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" - ] - +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - - if CONFIG["TARGET_CPU"] == "loongarch64": - +-if CONFIG["TARGET_CPU"] == "loongarch64": +- - DEFINES["_GNU_SOURCE"] = True - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", - "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c", -@@ -217,7 +118,6 @@ if CONFIG["TARGET_CPU"] == "mips32": + if CONFIG["TARGET_CPU"] == "mips32": DEFINES["MIPS32_LE"] = True DEFINES["MIPS_FPU_LE"] = True -- DEFINES["_GNU_SOURCE"] = True - - SOURCES += [ - "/third_party/libwebrtc/common_audio/signal_processing/resample_by_2_mips.c" -@@ -234,8 +134,6 @@ if CONFIG["TARGET_CPU"] == "mips32": - - if CONFIG["TARGET_CPU"] == "mips64": - - DEFINES["_GNU_SOURCE"] = True - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", - "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c", -@@ -250,78 +148,7 @@ if CONFIG["TARGET_CPU"] == "ppc64": - "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" - ] - --if CONFIG["TARGET_CPU"] == "x86": +-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"] == "aarch64": -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" -- ] -- -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86": - -- CFLAGS += [ -- "-msse2" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" -- ] -- --if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86_64": -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c", -- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm": - - DEFINES["_GNU_SOURCE"] = True - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c" +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": +- +- CXXFLAGS += [ +- "-msse2" - ] - --if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64": -+if CONFIG["TARGET_CPU"] == "riscv64": - - 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": - "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" - ] - --if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": -+if CONFIG["TARGET_CPU"] == "x86": - - CFLAGS += [ - "-msse2" - ] - - DEFINES["_GNU_SOURCE"] = True + DEFINES["WEBRTC_ENABLE_AVX2"] = True - 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": - "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" - ] - -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 - 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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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,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 - 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": -@@ -154,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" -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_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 ---- 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" + 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 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 +@@ -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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +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" +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" -@@ -59,114 +72,7 @@ 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 - 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["_GNU_SOURCE"] = True - 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": - -@@ -174,82 +80,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 -- + 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": -- ++if 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_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 ---- 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" +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 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" 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_ARCH_ARM64"] = True +DEFINES["WEBRTC_BSD"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" - DEFINES["WEBRTC_HAS_NEON"] = True + 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["_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"]: +@@ -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 - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True -- DEFINES["__ARM_NEON__"] = "1" - 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["_GNU_SOURCE"] = True - 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_ARCH_ARM64"] = True - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__ARM_NEON__"] = "1" - 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_ARCH_ARM64"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True - DEFINES["_CRT_NONSTDC_NO_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["__ARM_NEON__"] = "1" - DEFINES["__STD_C"] = True -- ++ DEFINES["_DEBUG"] = True + + if CONFIG["TARGET_CPU"] == "aarch64": + +@@ -125,30 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": + DEFINES["WEBRTC_HAS_NEON"] = True + DEFINES["__ARM_NEON__"] = "1" + -if CONFIG["TARGET_CPU"] == "arm": - -- CFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- SOURCES += [ +- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse_arm.S", +- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12_armv7.S" +- ] - - DEFINES["_DEBUG"] = 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": +@@ -158,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"] == "Android" and CONFIG["TARGET_CPU"] == "aarch64": +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - -- DEFINES["WEBRTC_ARCH_ARM64"] = True -- DEFINES["__ARM_NEON__"] = "1" +- DEFINES["_GNU_SOURCE"] = True - --if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm": - -- DEFINES["WEBRTC_ARCH_ARM64"] = True -- DEFINES["__ARM_NEON__"] = "1" +- DEFINES["_GNU_SOURCE"] = True - - Library("common_audio_neon_c_gn") -diff --git third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build -index 410a9b6c9e1e..fcf864a3511b 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" +-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("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 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" 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_ARCH_ARM64"] = True +DEFINES["WEBRTC_BSD"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" - DEFINES["WEBRTC_HAS_NEON"] = True + 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["_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"]: +@@ -83,108 +92,7 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" - -if 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" +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c" - ] - -- DEFINES["WEBRTC_ARCH_ARM64"] = True +-if CONFIG["OS_TARGET"] == "Darwin": +- - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True -- DEFINES["__ARM_NEON__"] = "1" - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - --if CONFIG["OS_TARGET"] == "Linux": -- -- CXXFLAGS += [ -- "-std=gnu++20" +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", +- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c", +- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" - ] - +-if CONFIG["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["_GNU_SOURCE"] = True - 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_ARCH_ARM64"] = True - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__ARM_NEON__"] = "1" - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - --if CONFIG["OS_TARGET"] == "WINNT": -- -- CXXFLAGS += [ -- "-std:c++20" +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", +- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c", +- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" - ] - +-if CONFIG["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_ARCH_ARM64"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True - DEFINES["_CRT_NONSTDC_NO_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["__ARM_NEON__"] = "1" - DEFINES["__STD_C"] = True - -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", +- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c", +- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" - ] -- ++ DEFINES["_DEBUG"] = True + + if CONFIG["TARGET_CPU"] == "aarch64": + +@@ -192,20 +100,14 @@ if CONFIG["TARGET_CPU"] == "aarch64": + DEFINES["WEBRTC_HAS_NEON"] = True + DEFINES["__ARM_NEON__"] = "1" + -if CONFIG["TARGET_CPU"] == "arm": - -- CXXFLAGS += [ +- CFLAGS += [ - "-mfpu=neon" -- ] -- ++ UNIFIED_SOURCES += [ ++ "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", ++ "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c", ++ "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" + ] + - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["TARGET_CPU"] == "loongarch64": + +- DEFINES["_GNU_SOURCE"] = True +- + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", + "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c", +@@ -216,7 +118,6 @@ if CONFIG["TARGET_CPU"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True + + SOURCES += [ + "/third_party/libwebrtc/common_audio/signal_processing/resample_by_2_mips.c" +@@ -233,8 +134,6 @@ if CONFIG["TARGET_CPU"] == "mips32": + + if CONFIG["TARGET_CPU"] == "mips64": + +- DEFINES["_GNU_SOURCE"] = True +- + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", + "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c", +@@ -249,78 +148,7 @@ if CONFIG["TARGET_CPU"] == "ppc64": + "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" + ] + +-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 - +- 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"] == "aarch64": - -- DEFINES["WEBRTC_ARCH_ARM64"] = True -- DEFINES["__ARM_NEON__"] = "1" +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", +- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" +- ] +- +-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86": +- +- CFLAGS += [ +- "-msse2" +- ] +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", +- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" +- ] +- +-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86_64": +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", +- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" +- ] - -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - -- DEFINES["WEBRTC_ARCH_ARM64"] = True -- DEFINES["__ARM_NEON__"] = "1" +- DEFINES["_GNU_SOURCE"] = True - - Library("common_audio_neon_gn") -diff --git third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build -index 95fa6e2c26ca..b53526107ee5 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() +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", +- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c", +- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" +- ] +- +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm": +- +- DEFINES["_GNU_SOURCE"] = True +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c" +- ] +- +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64": ++if CONFIG["TARGET_CPU"] == "riscv64": -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", +@@ -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" + ] + +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": ++if CONFIG["TARGET_CPU"] == "x86": + + CFLAGS += [ + "-msse2" + ] + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", +@@ -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" + ] + +-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 + + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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_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" +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" -@@ -48,159 +61,16 @@ 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 - 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 += [ -- "-msse2", -- "-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["_GNU_SOURCE"] = True - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - -- CXXFLAGS += [ -- "-msse2", -- "-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": + +@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": + DEFINES["WEBRTC_HAS_NEON"] = True + DEFINES["__ARM_NEON__"] = "1" + +-if CONFIG["TARGET_CPU"] == "arm": - -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" +- CXXFLAGS += [ +- "-mfpu=neon" - ] - +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["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 - +- 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", -- "-msse2" -- ] + CXXFLAGS += [ + "-msse2" + ] + +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - --if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86_64": +- 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"] == "x86": -+if CONFIG["TARGET_CPU"] == "x86": - - CXXFLAGS += [ - "-msse2", - "-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": - 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 ---- 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() +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + Library("common_audio_cc_gn") +diff --git third_party/libwebrtc/common_audio/common_audio_gn/moz.build third_party/libwebrtc/common_audio/common_audio_gn/moz.build +index 4b2f40786f1b..9649eb186b74 100644 +--- third_party/libwebrtc/common_audio/common_audio_gn/moz.build ++++ third_party/libwebrtc/common_audio/common_audio_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["_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"]: +@@ -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 - 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": -@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -153,82 +76,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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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" 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_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 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["__ARM_NEON__"] = "1" +DEFINES["__STDC_CONSTANT_MACROS"] = True +DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "xul" -@@ -42,83 +51,7 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -49,131 +60,6 @@ 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_ARCH_ARM64"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True +- DEFINES["__ARM_NEON__"] = "1" - 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["_GNU_SOURCE"] = True - 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_ARCH_ARM64"] = True - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__ARM_NEON__"] = "1" - 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_ARCH_ARM64"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True - DEFINES["_CRT_NONSTDC_NO_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["__ARM_NEON__"] = "1" - 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": - +- CFLAGS += [ +- "-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": - -@@ -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 -- + 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": +-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "aarch64": - -- DEFINES["_GNU_SOURCE"] = True +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["__ARM_NEON__"] = "1" - --if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - -- DEFINES["_GNU_SOURCE"] = True +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["__ARM_NEON__"] = "1" - - 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 ---- 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" + 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 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 +@@ -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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" ++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 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["__ARM_NEON__"] = "1" +DEFINES["__STDC_CONSTANT_MACROS"] = True +DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "xul" -@@ -42,94 +51,7 @@ 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": - - 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_ARCH_ARM64"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True +- DEFINES["__ARM_NEON__"] = "1" - 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["_GNU_SOURCE"] = True - 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_ARCH_ARM64"] = True - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__ARM_NEON__"] = "1" - 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_ARCH_ARM64"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True - DEFINES["_CRT_NONSTDC_NO_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["__ARM_NEON__"] = "1" - 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": - 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": - -@@ -165,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 -- + 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": +-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "aarch64": - -- DEFINES["_GNU_SOURCE"] = True +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["__ARM_NEON__"] = "1" - --if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - -- DEFINES["_GNU_SOURCE"] = True +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["__ARM_NEON__"] = "1" - - 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 ---- 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" + 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 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 +@@ -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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +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" +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"]: +@@ -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 - 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" +- "-msse2" - ] - - 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["_GNU_SOURCE"] = True - 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" +- "-msse2" - ] - - 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": - -@@ -165,122 +71,38 @@ if CONFIG["TARGET_CPU"] == "aarch64": - "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc" - ] - --if CONFIG["TARGET_CPU"] == "arm": -- -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc" -- ] -- --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 - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_mips.cc" - ] - --if CONFIG["TARGET_CPU"] == "mips64": -- -- DEFINES["_GNU_SOURCE"] = True -- - if CONFIG["TARGET_CPU"] == "x86": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc" -- ] -- --if CONFIG["TARGET_CPU"] == "x86_64": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc" -- ] - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - -- DEFINES["_DEBUG"] = True -- + 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", - "-msse2" - ] - --if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86_64": - - CXXFLAGS += [ +- "-msse2", - "-msse2" - ] - --if CONFIG["OS_TARGET"] == "Darwin" and CONFIG["TARGET_CPU"] == "x86_64": +-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86_64": - - 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": -+ DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["TARGET_CPU"] == "x86": -- CXXFLAGS += [ -- "-msse2", -- "-msse2" -+ UNIFIED_SOURCES += [ -+ "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc" + CXXFLAGS += [ + "-msse2", + "-msse2" ] -- DEFINES["_GNU_SOURCE"] = True -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": +if CONFIG["TARGET_CPU"] == "x86_64": CXXFLAGS += [ "-msse2" - ] - -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["OS_TARGET"] == "OpenBSD" and CONFIG["TARGET_CPU"] == "x86_64": -+ DEFINES["WEBRTC_ENABLE_AVX2"] = True - -- CXXFLAGS += [ -- "-msse2" -+ UNIFIED_SOURCES += [ -+ "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc" - ] - - 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 ---- 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" +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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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": -- -- CXXFLAGS += [ -- "-std=gnu++20" +- 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": - -- 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": -@@ -150,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -141,82 +64,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("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 ---- third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build -+++ third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build + Library("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 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" 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["_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,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 - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -- ] -- -if CONFIG["OS_TARGET"] == "Linux": - - DEFINES["USE_AURA"] = "1" - 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 - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -- ] -- -if CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True - DEFINES["NOMINMAX"] = True - DEFINES["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 -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -138,20 +59,12 @@ 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 - -- SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.S" -+ UNIFIED_SOURCES += [ -+ "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" - ] - - if CONFIG["TARGET_CPU"] == "loongarch64": - +-if CONFIG["TARGET_CPU"] == "loongarch64": +- - DEFINES["_GNU_SOURCE"] = True - - 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": + 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 - 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": + if CONFIG["TARGET_CPU"] == "x86": - if CONFIG["TARGET_CPU"] == "mips64": +@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64": -- DEFINES["_GNU_SOURCE"] = True -- - 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": - "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" - ] + DEFINES["WEBRTC_ENABLE_AVX2"] = 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"] == "aarch64": -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -- ] -- --if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86": -- -- CFLAGS += [ -- "-msse2" -- ] -+if CONFIG["TARGET_CPU"] == "riscv64": - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" - ] - --if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86_64": -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm": - - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64": -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": -+if CONFIG["TARGET_CPU"] == "x86": - - CFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True -+ DEFINES["WEBRTC_ENABLE_AVX2"] = True - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" - ] - +- -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 - - 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 ---- 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" +- + 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 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" 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["_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"]: +@@ -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 - 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": -@@ -173,82 +79,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 - -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 -- +@@ -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 - -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" +- + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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,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 - 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": -@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": - DEFINES["WEBRTC_HAS_NEON"] = True - DEFINES["__ARM_NEON__"] = "1" +@@ -144,122 +67,38 @@ if CONFIG["TARGET_CPU"] == "aarch64": + "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc" + ] -if CONFIG["TARGET_CPU"] == "arm": - - CXXFLAGS += [ - "-mfpu=neon" - ] - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc" +- ] +- -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 -- + + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_mips.cc" + ] + -if CONFIG["TARGET_CPU"] == "mips64": - - DEFINES["_GNU_SOURCE"] = True - +- if CONFIG["TARGET_CPU"] == "x86": - DEFINES["WEBRTC_ENABLE_AVX2"] = True - +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc" +- ] +- -if CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc" +- ] +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -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", "-msse2" ] +-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86_64": +- +- CXXFLAGS += [ +- "-msse2" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin" and CONFIG["TARGET_CPU"] == "x86_64": +- +- 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": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ +- "-msse2", - "-msse2" -- ] -- -- DEFINES["_GNU_SOURCE"] = True -+ DEFINES["WEBRTC_ENABLE_AVX2"] = True ++ UNIFIED_SOURCES += [ ++ "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc" + ] +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": +if CONFIG["TARGET_CPU"] == "x86_64": + CXXFLAGS += [ + "-msse2" + ] + - DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD" and CONFIG["TARGET_CPU"] == "x86_64": + DEFINES["WEBRTC_ENABLE_AVX2"] = True - Library("corruption_detection_converters_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 ---- third_party/libwebrtc/common_video/corruption_score_calculator_gn/moz.build -+++ third_party/libwebrtc/common_video/corruption_score_calculator_gn/moz.build +- CXXFLAGS += [ +- "-msse2" ++ UNIFIED_SOURCES += [ ++ "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc" + ] + + 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 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 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -46,82 +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["_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 -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -129,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": -@@ -165,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 - -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 -- - 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 ---- third_party/libwebrtc/common_video/frame_counts_gn/moz.build -+++ third_party/libwebrtc/common_video/frame_counts_gn/moz.build ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + Library("fft_size_256_gn") +diff --git third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build +index 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" 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["_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,94 +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 - +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" +- ] +- -if CONFIG["OS_TARGET"] == "Linux": - - DEFINES["USE_AURA"] = "1" - 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 - +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" +- ] +- -if CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True - DEFINES["NOMINMAX"] = True - DEFINES["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 +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" +- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -137,20 +59,12 @@ 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": -- +- SOURCES += [ +- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.S" ++ UNIFIED_SOURCES += [ ++ "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" + ] + + if CONFIG["TARGET_CPU"] == "loongarch64": + - DEFINES["_GNU_SOURCE"] = True - - if CONFIG["TARGET_CPU"] == "mips32": + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" + ] +@@ -159,7 +73,6 @@ 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": + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_mips.c" +@@ -167,8 +80,6 @@ if CONFIG["TARGET_CPU"] == "mips32": -@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64": + if CONFIG["TARGET_CPU"] == "mips64": - DEFINES["WEBRTC_ENABLE_AVX2"] = True +- DEFINES["_GNU_SOURCE"] = True +- + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" + ] +@@ -179,89 +90,27 @@ if CONFIG["TARGET_CPU"] == "ppc64": + "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" + ] +-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"] == "aarch64": +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" +- ] +- +-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86": +- +- CFLAGS += [ +- "-msse2" +- ] ++if CONFIG["TARGET_CPU"] == "riscv64": + + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" + ] + +-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86_64": +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" +- ] +- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True - +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" +- ] +- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm": - - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64": - -- DEFINES["_GNU_SOURCE"] = True +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" +- ] - +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": ++if CONFIG["TARGET_CPU"] == "x86": + + CFLAGS += [ + "-msse2" + ] + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" + ] + -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": -- ++if CONFIG["TARGET_CPU"] == "x86_64": + - 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 ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + 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 29f0179f0773..4ee8b246ab59 100644 +--- third_party/libwebrtc/common_video/common_video_gn/moz.build ++++ third_party/libwebrtc/common_video/common_video_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["_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"]: +@@ -58,93 +67,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["_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 +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -152,82 +75,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": -@@ -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 - -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": - -- 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("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 ---- 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() ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + 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 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" 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["_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 - 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": -@@ -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 - -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 -- +@@ -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 - -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("generic_frame_descriptor_gn") -diff --git third_party/libwebrtc/dcsctp_gn/moz.build third_party/libwebrtc/dcsctp_gn/moz.build -index 44f583c80d8a..f4469da2599d 100644 ---- third_party/libwebrtc/dcsctp_gn/moz.build -+++ third_party/libwebrtc/dcsctp_gn/moz.build +- + 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 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" 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["_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" - -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["_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 -- -- 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" -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": -@@ -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 -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("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 ---- third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build -+++ third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build + Library("frame_counts_gn") +diff --git third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build +index 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 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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" - -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["_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": +@@ -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 - -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 - +- 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": - -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": +- CXXFLAGS += [ +- "-msse2" +- ] - - DEFINES["_GNU_SOURCE"] = True -- - Library("registered_field_trials_gn") -diff --git third_party/libwebrtc/experiments/registered_field_trials_header_gn/moz.build third_party/libwebrtc/experiments/registered_field_trials_header_gn/moz.build -index edb8e084a33a..e2236e78c4a0 100644 ---- third_party/libwebrtc/experiments/registered_field_trials_header_gn/moz.build -+++ third_party/libwebrtc/experiments/registered_field_trials_header_gn/moz.build -@@ -32,9 +32,4 @@ LOCAL_INCLUDES += [ - "/tools/profiler/public" - ] ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True --if CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["UNICODE"] = True -- DEFINES["_UNICODE"] = True -- - Library("registered_field_trials_header_gn") -diff --git third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build -index 92e42333271c..fc88fc12b670 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() +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": ++if CONFIG["TARGET_CPU"] == "x86_64": -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + Library("generic_frame_descriptor_gn") +diff --git third_party/libwebrtc/dcsctp_gn/moz.build third_party/libwebrtc/dcsctp_gn/moz.build +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" 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["_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"]: +@@ -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 - 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": -@@ -165,82 +71,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 - -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 -- +@@ -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 - -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("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 ---- 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" +- + 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 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" 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["_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"]: +@@ -42,82 +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 - 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": -@@ -166,82 +72,21 @@ 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": - -- 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 -- +@@ -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"] == "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("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 ---- 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() +- + Library("registered_field_trials_gn") +diff --git third_party/libwebrtc/experiments/registered_field_trials_header_gn/moz.build third_party/libwebrtc/experiments/registered_field_trials_header_gn/moz.build +index edb8e084a33a..e2236e78c4a0 100644 +--- third_party/libwebrtc/experiments/registered_field_trials_header_gn/moz.build ++++ third_party/libwebrtc/experiments/registered_field_trials_header_gn/moz.build +@@ -32,9 +32,4 @@ LOCAL_INCLUDES += [ + "/tools/profiler/public" + ] -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["UNICODE"] = True +- DEFINES["_UNICODE"] = True +- + Library("registered_field_trials_header_gn") +diff --git third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build +index 158436eafa45..251655a1a226 100644 +--- third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build ++++ third_party/libwebrtc/logging/rtc_event_audio_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["_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"]: +@@ -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 - 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": -@@ -164,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -144,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["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" -- ] -- + 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" - ] - +- 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("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 ---- third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build -+++ third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build + Library("rtc_event_audio_gn") +diff --git third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build +index 1ac713b1e2a5..552eb9cf4167 100644 +--- third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build ++++ third_party/libwebrtc/logging/rtc_event_bwe_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["_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"]: +@@ -51,93 +60,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["_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 +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -145,82 +68,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": -@@ -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 - -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": - -- 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("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 ---- 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() ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + Library("rtc_event_bwe_gn") +diff --git third_party/libwebrtc/logging/rtc_event_field_gn/moz.build third_party/libwebrtc/logging/rtc_event_field_gn/moz.build +index c1305a84a6cc..3087fdcc327a 100644 +--- third_party/libwebrtc/logging/rtc_event_field_gn/moz.build ++++ third_party/libwebrtc/logging/rtc_event_field_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["_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"]: +@@ -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 - 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": -@@ -156,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -143,82 +66,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("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 ---- 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" + 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 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" 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["_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"]: +@@ -42,86 +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 - 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": +@@ -129,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 - -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 -- +@@ -157,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"] == "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("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 ---- 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" +- + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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": -@@ -164,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -135,82 +65,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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 8e54172d3ffc..15705b114eb9 100644 +--- third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build ++++ third_party/libwebrtc/logging/rtc_event_pacing_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["_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"]: +@@ -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 - 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": -@@ -162,82 +68,21 @@ 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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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": +@@ -143,82 +66,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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 79fa2f18c369..42638e9c1a58 100644 +--- third_party/libwebrtc/logging/rtc_event_video_gn/moz.build ++++ third_party/libwebrtc/logging/rtc_event_video_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["_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"]: +@@ -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 - 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": +@@ -141,82 +64,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" -- ] -- + 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" - ] - +- 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("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 ---- third_party/libwebrtc/media/audio_source_gn/moz.build -+++ third_party/libwebrtc/media/audio_source_gn/moz.build + Library("rtc_event_video_gn") +diff --git third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build +index 4567caafbe26..2017f2c23000 100644 +--- third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build ++++ third_party/libwebrtc/logging/rtc_stream_config_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["_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" - -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["_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 +- +- 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 - -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 - +- 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": - -- 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("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 ---- 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() ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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": -@@ -162,82 +68,21 @@ 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["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" -- ] -- + 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" - ] - +- 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("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 ---- third_party/libwebrtc/media/media_channel_gn/moz.build -+++ third_party/libwebrtc/media/media_channel_gn/moz.build + 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 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" 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["_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,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 - -- OS_LIBS += [ -- "GLESv2", -- "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["_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 -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -138,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" -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": -@@ -166,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64": +@@ -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("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 ---- third_party/libwebrtc/media/media_channel_impl_gn/moz.build -+++ third_party/libwebrtc/media/media_channel_impl_gn/moz.build + Library("audio_source_gn") +diff --git third_party/libwebrtc/media/codec_gn/moz.build third_party/libwebrtc/media/codec_gn/moz.build +index 4dbfaebba1b4..ac11b1371193 100644 +--- third_party/libwebrtc/media/codec_gn/moz.build ++++ third_party/libwebrtc/media/codec_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["_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"]: +@@ -47,93 +56,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["_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 +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -141,82 +64,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": -@@ -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 - -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": - -- 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("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 ---- 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() ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + Library("codec_gn") +diff --git third_party/libwebrtc/media/media_channel_gn/moz.build third_party/libwebrtc/media/media_channel_gn/moz.build +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" 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["_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"]: +@@ -42,94 +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 - 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": -- -- CXXFLAGS += [ -- "-std=gnu++20" +- OS_LIBS += [ +- "GLESv2", +- "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": - -- 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": -@@ -150,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -137,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 - -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 -- +@@ -165,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"] == "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("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 ---- third_party/libwebrtc/media/media_engine_gn/moz.build -+++ third_party/libwebrtc/media/media_engine_gn/moz.build +- + 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 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" 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["_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,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 - -- OS_LIBS += [ -- "GLESv2", -- "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["_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 -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -138,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" -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": -@@ -166,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64": +@@ -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("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 ---- 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" + 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 95445fbdf6e8..68728dd78931 100644 +--- third_party/libwebrtc/media/media_constants_gn/moz.build ++++ third_party/libwebrtc/media/media_constants_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["_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,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 - 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": +@@ -129,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 += [ "-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("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 ---- 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 + 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 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" 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["_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"]: +@@ -42,94 +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 - 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 += [ - "GLESv2", - "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", -- "ole32", -- "oleaut32", - "secur32", -- "strmiids", -- "user32", - "winmm" - ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -168,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -137,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 - -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 -- +@@ -165,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"] == "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("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 ---- 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" +- + 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 0989e698875d..2e232c6ada46 100644 +--- third_party/libwebrtc/media/rid_description_gn/moz.build ++++ third_party/libwebrtc/media/rid_description_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["RTC_USE_LIBAOM_AV1_ENCODER"] = 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["_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"]: +@@ -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 - 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 += [ -- "GLESv2", - "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": -@@ -163,82 +68,21 @@ 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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 72d03172392a..235284ab4f03 100644 +--- third_party/libwebrtc/media/rtc_audio_video_gn/moz.build ++++ third_party/libwebrtc/media/rtc_audio_video_gn/moz.build +@@ -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 +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["_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"]: +@@ -48,98 +57,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 += [ - "GLESv2", - "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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", +- "ole32", +- "oleaut32", - "secur32", +- "strmiids", +- "user32", - "winmm" - ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -138,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -147,82 +65,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": -@@ -166,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 - -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": - -- 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("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 ---- 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" - DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + 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 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 +@@ -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 +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["_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"]: +@@ -47,94 +56,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 += [ +- "GLESv2", +- "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["_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 +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -142,82 +64,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": -@@ -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 - -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": - -- 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("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 ---- 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 ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + Library("rtc_internal_video_codecs_gn") +diff --git third_party/libwebrtc/media/rtc_media_base_gn/moz.build third_party/libwebrtc/media/rtc_media_base_gn/moz.build +index 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" 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["_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"]: +@@ -42,94 +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 - - OS_LIBS += [ - "GLESv2", - "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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", -- "ole32", -- "oleaut32", - "secur32", -- "strmiids", -- "user32", - "winmm" - ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -143,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -137,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": -@@ -171,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64": +@@ -165,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("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 ---- 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" + 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 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" 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["_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"]: +@@ -42,82 +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 - 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": +@@ -125,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 - -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 -- +@@ -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"] == "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("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 ---- 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" +- + 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 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 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["_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"]: +@@ -43,98 +52,7 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" - -if 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 += [ - "GLESv2", - "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", +- "ole32", +- "oleaut32", - "secur32", +- "strmiids", +- "user32", - "winmm" - ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -162,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -142,25 +60,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 - -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 -- +@@ -170,40 +73,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"] == "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("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 ---- third_party/libwebrtc/media/rtp_utils_gn/moz.build -+++ third_party/libwebrtc/media/rtp_utils_gn/moz.build +- + 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 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 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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" - -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["_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 +- +- 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 - -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 - +- 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": - -- 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("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 ---- third_party/libwebrtc/media/stream_params_gn/moz.build -+++ third_party/libwebrtc/media/stream_params_gn/moz.build ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + 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 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 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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,94 +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 += [ +- "GLESv2", +- "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["_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 +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -126,25 +59,10 @@ 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": -@@ -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 - -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": - -- 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("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 ---- 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() ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + 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 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" 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["_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"]: +@@ -42,82 +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 - 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": +@@ -125,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 - -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 -- +@@ -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"] == "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("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 ---- 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" +- + 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 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" 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["_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"]: +@@ -42,82 +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 - 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": +@@ -125,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 - -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 -- +@@ -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"] == "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("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 ---- 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" +- + 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 b69a51a5983d..ededc9780d49 100644 +--- third_party/libwebrtc/media/video_adapter_gn/moz.build ++++ third_party/libwebrtc/media/video_adapter_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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 f615256ba4ed..c1f7fc585462 100644 +--- third_party/libwebrtc/media/video_broadcaster_gn/moz.build ++++ third_party/libwebrtc/media/video_broadcaster_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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 8fe45f5a5bd6..cea55451b02a 100644 +--- third_party/libwebrtc/media/video_common_gn/moz.build ++++ third_party/libwebrtc/media/video_common_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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 0c67351e481a..b7102601a5f8 100644 +--- third_party/libwebrtc/media/video_source_base_gn/moz.build ++++ third_party/libwebrtc/media/video_source_base_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["_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"]: +@@ -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 - 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": -@@ -164,82 +70,21 @@ 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["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" -- ] -- + 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" - ] - +- 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("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 ---- third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build + Library("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 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 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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" - -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["_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 +- +- 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 - -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 - +- 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": - -- 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("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 ---- 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() ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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": +@@ -143,82 +66,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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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" 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["_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"]: +@@ -42,82 +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 - 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": +@@ -125,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 - -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 -- +@@ -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"] == "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("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 ---- 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" +- + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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,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 - 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": -- -- CXXFLAGS += [ -- "-std=gnu++20" +- 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": - -- 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": -@@ -150,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" -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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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": -@@ -171,82 +77,21 @@ 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["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" -- ] -- + 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" - ] - +- 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("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 ---- third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build + Library("audio_encoder_cng_gn") +diff --git third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build +index 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 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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" - -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": -@@ -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" -if CONFIG["TARGET_CPU"] == "arm": - -- CFLAGS += [ +- 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": - -- CFLAGS += [ +- 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": - - CFLAGS += [ + 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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": -@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -150,82 +73,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" -- ] -- + 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" - ] - +- 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("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 ---- third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build + 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 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" 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["_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" - -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": -@@ -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" -if CONFIG["TARGET_CPU"] == "arm": - - CFLAGS += [ - "-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": - - CFLAGS += [ - "-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": - CFLAGS += [ "-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("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 ---- 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" + 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 1675e90d8790..d01e4b686418 100644 +--- third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/g711_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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 ---- third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build + 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 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" 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["_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,82 +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"] == "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": +@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_HAS_NEON"] = True DEFINES["__ARM_NEON__"] = "1" -if CONFIG["TARGET_CPU"] == "arm": - +- CFLAGS += [ +- "-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": -@@ -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 - -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": +- +- CFLAGS += [ +- "-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": - + CFLAGS += [ + "-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("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 ---- third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + Library("g722_c_gn") +diff --git third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build +index fa074502a127..4f9ad9cd4a62 100644 +--- third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/g722_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["_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"]: +@@ -47,93 +56,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["_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 +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -133,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_HAS_NEON"] = True DEFINES["__ARM_NEON__"] = "1" -if CONFIG["TARGET_CPU"] == "arm": - -- CFLAGS += [ +- 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": - -- CFLAGS += [ -- "-msse2" -- ] -- + 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": - - CFLAGS += [ - "-msse2" - ] - +- 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("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 ---- 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" + 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 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" 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["_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"]: +@@ -42,82 +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 - 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": +@@ -125,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 - -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 -- +@@ -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"] == "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("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 ---- 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" +- + 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 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" 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["_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"]: +@@ -49,82 +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 - 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": -@@ -196,82 +102,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -132,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_HAS_NEON"] = True DEFINES["__ARM_NEON__"] = "1" -if CONFIG["TARGET_CPU"] == "arm": - -- CXXFLAGS += [ +- CFLAGS += [ - "-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 += [ +- CFLAGS += [ - "-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 += [ + CFLAGS += [ "-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("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 ---- third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build + 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 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 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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,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 - +- 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["_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 +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -130,82 +63,21 @@ 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": - -- CFLAGS += [ +- 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": - -- CFLAGS += [ -- "-msse2" -- ] -- + 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": - - CFLAGS += [ - "-msse2" - ] - +- 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("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 ---- 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" + 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 b7100e120ab2..7e31677674ef 100644 +--- third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/neteq_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["_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"]: +@@ -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 - 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": -@@ -163,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -175,82 +98,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("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 ---- 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" + 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 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" 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["_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,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 - 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": +@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_HAS_NEON"] = True DEFINES["__ARM_NEON__"] = "1" -if CONFIG["TARGET_CPU"] == "arm": - -- CXXFLAGS += [ +- CFLAGS += [ - "-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 += [ +- CFLAGS += [ - "-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 += [ + CFLAGS += [ "-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("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 ---- 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" + 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 db4b694011a3..8abc614eedbe 100644 +--- third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/pcm16b_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["_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"]: +@@ -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 - 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": -@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -142,82 +65,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("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 ---- 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" + 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 7896cb765a18..f16ef0cde7d2 100644 +--- third_party/libwebrtc/modules/audio_coding/red_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/red_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_CODEC_OPUS"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" + 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_OPUS_SUPPORT_120MS_PTIME"] = "1" +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" -@@ -50,114 +63,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 - 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": -@@ -165,82 +71,21 @@ 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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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_CODEC_OPUS"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" + 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_OPUS_SUPPORT_120MS_PTIME"] = "1" +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" -@@ -50,114 +63,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 - 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": -@@ -165,82 +71,21 @@ 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 - -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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +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" +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" -@@ -49,107 +62,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 - 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": -@@ -157,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -144,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["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("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 ---- 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" + 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 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 +@@ -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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +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" +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"]: +@@ -50,93 +59,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["_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 +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -144,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["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 - +- 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": - -- 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("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 ---- 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() ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + 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 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 +@@ -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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +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" +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"]: +@@ -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 - 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": +@@ -136,82 +66,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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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" 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_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" +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" -@@ -49,114 +62,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" - -if 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": -@@ -164,82 +70,21 @@ 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": - -- 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 -- +@@ -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"] == "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("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 ---- 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 +- + 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 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 @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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,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 - - 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["_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 +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -130,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 - -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": -@@ -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 - -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": - -- 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("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 ---- 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" ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + 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 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 +@@ -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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" + 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" +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,94 +51,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": - - 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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -143,82 +66,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": -@@ -165,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 - -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": - -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": +- CXXFLAGS += [ +- "-msse2" +- ] - - DEFINES["_GNU_SOURCE"] = True -- - 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 ---- 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() ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-mavx2", -- "-mfma" -+ "-mfma", -+ "-std=gnu++20" - ] +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": ++if CONFIG["TARGET_CPU"] == "x86_64": - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + 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 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" 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_APM_DEBUG_DUMP"] = "1" +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" +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" -@@ -57,143 +67,9 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -42,86 +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 - 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["_GNU_SOURCE"] = True -- 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" -- ] -- --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"] == "x86": -+if CONFIG["TARGET_CPU"] == "x86": - - 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 ---- 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" - 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": +@@ -129,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": +@@ -157,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("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 ---- third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build -+++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build + 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 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" 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["_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" - -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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True 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" -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": -@@ -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 -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("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 ---- 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" + 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 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 +@@ -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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1" +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" +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" -@@ -103,114 +116,7 @@ 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 - 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["_GNU_SOURCE"] = True - 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" - ] +- +-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"] == "x86": ++if CONFIG["TARGET_CPU"] == "x86": + + 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 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" + 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 +- 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": -@@ -218,82 +124,21 @@ 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": - -- 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 -- +@@ -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"] == "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("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 ---- third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build -+++ third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build +- + 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 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" 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["_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,93 +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 - - 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["_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 +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -130,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" -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": -@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64": +@@ -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 - -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("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 ---- 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" + 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 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 +@@ -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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" + 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" +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,87 +51,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": - - 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["_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 +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -130,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -197,82 +120,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": -@@ -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 - -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 -- - 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 ---- third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build -+++ third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + 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 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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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 ---- third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build -+++ third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build + 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 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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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 ---- 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 + 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 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" 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["_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,86 +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 - - 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["_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": + +@@ -129,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": + +@@ -157,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("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 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" + 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,86 +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 - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" +- "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 + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -137,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" -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": -@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64": +@@ -157,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("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 ---- 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" + 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 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" 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["_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"]: +@@ -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 - 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": +@@ -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 - -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 -- +@@ -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 - -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("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 ---- 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" +- + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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" - ] - -- SOURCES += [ -- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" -- ] -- -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 - -- SOURCES += [ -- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" -- ] -- -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 - -- SOURCES += [ -- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" -- ] -- -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 - -- SOURCES += [ -- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" - ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -172,27 +69,12 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": + DEFINES["WEBRTC_HAS_NEON"] = True DEFINES["__ARM_NEON__"] = "1" - SOURCES += [ -- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_neon.cc" -- ] -- -if CONFIG["TARGET_CPU"] == "arm": - - CXXFLAGS += [ - "-mfpu=neon" - ] - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- SOURCES += [ -+ "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc", - "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_neon.cc" - ] - - if CONFIG["TARGET_CPU"] == "loongarch64": - +-if CONFIG["TARGET_CPU"] == "loongarch64": +- - DEFINES["_GNU_SOURCE"] = True - - SOURCES += [ - "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" - ] -@@ -201,7 +83,6 @@ if CONFIG["TARGET_CPU"] == "mips32": + if CONFIG["TARGET_CPU"] == "mips32": DEFINES["MIPS32_LE"] = True DEFINES["MIPS_FPU_LE"] = True -- DEFINES["_GNU_SOURCE"] = True - - SOURCES += [ - "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_mips.cc" -@@ -209,8 +90,6 @@ if CONFIG["TARGET_CPU"] == "mips32": - - if CONFIG["TARGET_CPU"] == "mips64": - - DEFINES["_GNU_SOURCE"] = True - - SOURCES += [ - "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" - ] -@@ -221,77 +100,27 @@ if CONFIG["TARGET_CPU"] == "ppc64": - "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" - ] - --if CONFIG["TARGET_CPU"] == "x86": +-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" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - 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"] == "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"] == "x86": +- +- CXXFLAGS += [ +- "-msse2" - ] - --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"] == "x86": -+if CONFIG["TARGET_CPU"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - - DEFINES["_GNU_SOURCE"] = True + DEFINES["WEBRTC_ENABLE_AVX2"] = True - SOURCES += [ - "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" - ] - -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 - 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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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_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" +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" -@@ -47,114 +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 - 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" +- SOURCES += [ +- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" - ] - +-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": -- -- CXXFLAGS += [ -- "-std=gnu++20" +- SOURCES += [ +- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" - ] - +-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": - -- 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" +- SOURCES += [ +- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" - ] - +-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" +- SOURCES += [ +- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" - ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": - DEFINES["WEBRTC_HAS_NEON"] = True +@@ -151,27 +65,12 @@ if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["__ARM_NEON__"] = "1" + SOURCES += [ +- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_neon.cc" +- ] +- -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": -- +- SOURCES += [ ++ "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc", + "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_neon.cc" + ] + + if CONFIG["TARGET_CPU"] == "loongarch64": + - DEFINES["_GNU_SOURCE"] = True - - if CONFIG["TARGET_CPU"] == "mips32": + SOURCES += [ + "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" + ] +@@ -180,7 +79,6 @@ 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": + SOURCES += [ + "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_mips.cc" +@@ -188,8 +86,6 @@ if CONFIG["TARGET_CPU"] == "mips32": + if CONFIG["TARGET_CPU"] == "mips64": + +- DEFINES["_GNU_SOURCE"] = True +- + SOURCES += [ + "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" + ] +@@ -200,77 +96,27 @@ if CONFIG["TARGET_CPU"] == "ppc64": + "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" + ] + +-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 - +- SOURCES += [ +- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" +- ] +- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm": - - DEFINES["_GNU_SOURCE"] = True ++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": - --if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": +- 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": + CXXFLAGS += [ "-msse2" ] - DEFINES["_GNU_SOURCE"] = True + DEFINES["WEBRTC_ENABLE_AVX2"] = True + SOURCES += [ + "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" + ] + -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("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 ---- 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" + 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 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 +@@ -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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" + 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" +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"]: +@@ -47,93 +56,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["_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 +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -126,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -141,82 +64,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": -@@ -154,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64": +- 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("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 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" + 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 +- 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": + +@@ -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("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 +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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" 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" +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" -@@ -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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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 - -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("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 +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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" 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" +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" -@@ -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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" 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" +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" -@@ -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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" 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" +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" -@@ -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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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" 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["_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" - -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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True 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" -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": -@@ -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 -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("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 +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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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 - -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("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 +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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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 +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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +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" +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" -@@ -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 - 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["_GNU_SOURCE"] = True - 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" - ] - -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"] == "x86": +if CONFIG["TARGET_CPU"] == "x86": 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" 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["_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" - -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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True 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" -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": -@@ -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 -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("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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" 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" +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" -@@ -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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" 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" +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" -@@ -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 - 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": - +- 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 +64,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:c++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("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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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 +- +- 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": -@@ -162,82 +68,21 @@ 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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" + 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" +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"]: +@@ -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 - 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": +@@ -141,82 +64,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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" 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" +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" -@@ -47,114 +60,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 - 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": -@@ -162,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -143,82 +66,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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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_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" +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" -@@ -49,114 +62,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 - 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": -@@ -164,82 +70,21 @@ 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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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" 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["_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"]: +@@ -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 - 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": +@@ -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 - -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 -- +@@ -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 - -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("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 ---- 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" +- + 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 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 +@@ -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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" + 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" +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,94 +51,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": - - 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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -146,82 +69,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": -@@ -165,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 - -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": - -- 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("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 ---- 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() ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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_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" +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" -@@ -52,114 +65,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 - 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": -@@ -167,82 +73,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -141,82 +64,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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" + 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" +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" -@@ -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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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_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" +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" -@@ -47,114 +60,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 - 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": -@@ -162,82 +68,21 @@ 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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" + 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" +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"]: +@@ -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 - 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": +@@ -153,82 +76,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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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_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" +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" -@@ -59,114 +72,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 - 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": -@@ -174,82 +80,21 @@ 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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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": +@@ -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 - -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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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": +@@ -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 - -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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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": +@@ -134,82 +64,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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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": - +- 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": + +@@ -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 +- +-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:c++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("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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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" + +@@ -53,93 +62,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" - 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": -@@ -155,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -147,82 +70,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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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 += [ +- "GLESv2", - "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": -@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -142,82 +64,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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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": -@@ -168,82 +74,21 @@ 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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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 += [ - "GLESv2", - "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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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": +@@ -145,82 +68,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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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 += [ - "GLESv2", - "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": -@@ -163,82 +68,21 @@ 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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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": -@@ -166,82 +72,21 @@ 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 - -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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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 += [ -- "GLESv2", - "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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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,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 - 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": -@@ -154,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" -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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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 += [ +- "GLESv2", - "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": +@@ -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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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": +@@ -141,82 +64,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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +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" +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,115 +59,7 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -47,102 +56,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 -- 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 += [ -- "GLESv2", -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - CXXFLAGS += [ -- "-std=gnu++20" +- "-msse2" - ] - - 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["_GNU_SOURCE"] = True - 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" +- "-msse2" - ] - - 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": - -@@ -162,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["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("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 ---- 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" - 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" - -@@ -47,114 +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 -- 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": - -@@ -162,82 +68,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("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 ---- 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" - 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_AVX2"] = True - DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" - DEFINES["WEBRTC_LIBRARY_IMPL"] = True - DEFINES["WEBRTC_MOZILLA_BUILD"] = True - DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" -+DEFINES["WEBRTC_POSIX"] = True - DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" -+DEFINES["_FILE_OFFSET_BITS"] = "64" -+DEFINES["_LARGEFILE64_SOURCE"] = True -+DEFINES["_LARGEFILE_SOURCE"] = True - 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"]: - if CONFIG["MOZ_DEBUG"] == "1": - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" -- --if CONFIG["OS_TARGET"] == "Darwin": -- -- CXXFLAGS += [ -- "-msse2", -- "-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["_GNU_SOURCE"] = True -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "OpenBSD": -- -- CXXFLAGS += [ -- "-msse2", -- "-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 -- --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"] == "x86": +if CONFIG["TARGET_CPU"] == "x86": CXXFLAGS += [ "-msse2", "-msse2" ] -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": +if CONFIG["TARGET_CPU"] == "x86_64": 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 +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["_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 - DEFINES["__STDC_FORMAT_MACROS"] = True - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/mac/desktop_configuration_monitor.cc", - "/third_party/libwebrtc/modules/desktop_capture/mac/desktop_frame_utils.cc", - "/third_party/libwebrtc/modules/desktop_capture/mac/full_screen_mac_application_handler.cc", - "/third_party/libwebrtc/modules/desktop_capture/mac/window_list_utils.cc" - ] - -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 - - SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc" - ] - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc", - "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc" - ] - -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["WEBRTC_USE_X11"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ - "X11", - "Xcomposite", - "Xdamage", - "Xext", - "Xfixes", - "Xrandr", - "Xrender" - ] - - SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc" - ] - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc", - "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc", - "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc" - ] - -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", - "d3d11", - "dwmapi", - "dxgi", - "iphlpapi", - "secur32", - "shcore", - "winmm" - ] - - SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc" - ] - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/cropping_window_capturer_win.cc", - "/third_party/libwebrtc/modules/desktop_capture/desktop_frame_win.cc", - "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_win.cc", - "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_win.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/cursor.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/d3d_device.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/desktop.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/desktop_capture_utils.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/display_configuration_monitor.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/dxgi_context.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/dxgi_duplicator_controller.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/dxgi_frame.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/dxgi_output_duplicator.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/dxgi_texture.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/dxgi_texture_mapping.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/dxgi_texture_staging.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/full_screen_win_application_handler.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/scoped_thread_desktop.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/screen_capture_utils.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/screen_capturer_win_directx.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/selected_window_context.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_source.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/wgc_desktop_frame.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/window_capture_utils.cc", - "/third_party/libwebrtc/modules/desktop_capture/win/window_capturer_win_gdi.cc", - "/third_party/libwebrtc/modules/desktop_capture/window_capturer_win.cc", - "/third_party/libwebrtc/modules/desktop_capture/window_finder_win.cc" - ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_ARCH_ARM64"] = True 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 DEFINES["WEBRTC_USE_PIPEWIRE"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["__ARM_NEON__"] = "1" 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 += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc", + "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc" ] 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", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" - ] - -if CONFIG["TARGET_CPU"] == "loongarch64": - - DEFINES["WEBRTC_USE_X11"] = True - DEFINES["_GNU_SOURCE"] = True - - OS_LIBS += [ - "X11", - "Xcomposite", - "Xdamage", - "Xext", - "Xfixes", - "Xrandr", - "Xrender" - ] - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc", + "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc", + "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc" ] 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 - DEFINES["_GNU_SOURCE"] = True 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 += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc", + "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc" ] 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", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc", + "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc", + "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc" ] if CONFIG["TARGET_CPU"] == "mips64": DEFINES["WEBRTC_USE_PIPEWIRE"] = True - DEFINES["_GNU_SOURCE"] = True 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 += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc", + "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc" ] 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", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" - ] - -if CONFIG["TARGET_CPU"] == "ppc64": - - DEFINES["WEBRTC_USE_X11"] = True - - OS_LIBS += [ - "X11", - "Xcomposite", - "Xdamage", - "Xext", - "Xfixes", - "Xrandr", - "Xrender" - ] - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc", + "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc", + "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc" ] 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"] == "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["WEBRTC_USE_PIPEWIRE"] = True - DEFINES["_GNU_SOURCE"] = True - - LOCAL_INCLUDES += [ - "/third_party/libepoxy/libepoxy/include/", - "/third_party/libwebrtc/third_party/libepoxy/libepoxy/include/" - ] - - SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" - ] - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", - "/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", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" - ] - -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64": - - DEFINES["WEBRTC_USE_X11"] = True - - OS_LIBS += [ - "X11", - "Xcomposite", - "Xdamage", - "Xext", - "Xfixes", - "Xrandr", - "Xrender" - ] - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" - ] - -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": - CXXFLAGS += [ "-msse2" ] + DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_USE_PIPEWIRE"] = True - DEFINES["_GNU_SOURCE"] = True 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 += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc", + "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc" ] 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", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc", + "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc", + "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc" ] -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": +if CONFIG["TARGET_CPU"] == "x86_64": + DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_USE_PIPEWIRE"] = True - DEFINES["_GNU_SOURCE"] = True 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 += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc", + "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc" ] 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", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc", + "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc", + "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc" ] -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": 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" ] -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm": - - DEFINES["WEBRTC_USE_X11"] = True - - OS_LIBS += [ - "X11", - "Xcomposite", - "Xdamage", - "Xext", - "Xfixes", - "Xrandr", - "Xrender" - ] +if not CONFIG["MOZ_X11"] and CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "loongarch64": UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" + "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_null.cc", + "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_null.cc", + "/third_party/libwebrtc/modules/desktop_capture/window_capturer_null.cc" ] -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips32": - - DEFINES["WEBRTC_USE_X11"] = True +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "loongarch64": - OS_LIBS += [ - "X11", - "Xcomposite", - "Xdamage", - "Xext", - "Xfixes", - "Xrandr", - "Xrender" + SOURCES += [ + "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc" ] UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" + "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc", + "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc" ] -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips64": - - DEFINES["WEBRTC_USE_X11"] = True - - OS_LIBS += [ - "X11", - "Xcomposite", - "Xdamage", - "Xext", - "Xfixes", - "Xrandr", - "Xrender" - ] +if not CONFIG["MOZ_X11"] and CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "ppc64": UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" + "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_null.cc", + "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_null.cc", + "/third_party/libwebrtc/modules/desktop_capture/window_capturer_null.cc" ] -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "ppc64": - DEFINES["WEBRTC_USE_X11"] = True - - OS_LIBS += [ - "X11", - "Xcomposite", - "Xdamage", - "Xext", - "Xfixes", - "Xrandr", - "Xrender" + SOURCES += [ + "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc" ] UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" + "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc", + "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc" ] -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": +if not CONFIG["MOZ_X11"] and CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "riscv64": - DEFINES["WEBRTC_USE_X11"] = True + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_null.cc", + "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_null.cc", + "/third_party/libwebrtc/modules/desktop_capture/window_capturer_null.cc" + ] - OS_LIBS += [ - "X11", - "Xcomposite", - "Xdamage", - "Xext", - "Xfixes", - "Xrandr", - "Xrender" +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "riscv64": + + SOURCES += [ + "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc" ] UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" + "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc", + "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc" ] 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 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - - - ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### - ### DO NOT edit it by hand. ### - -CMMFLAGS += [ - "-fobjc-arc" -] - -COMPILE_FLAGS["OS_INCLUDES"] = [] -AllowCompilerWarnings() - -DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" -DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" -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 - -FINAL_LIBRARY = "xul" - - -LOCAL_INCLUDES += [ - "!/dist/include/libwebrtc_overrides", - "!/ipc/ipdl/_ipdlheaders", - "!/third_party/libwebrtc/gen", - "/ipc/chromium/src", - "/third_party/abseil-cpp/", - "/third_party/libwebrtc/", - "/third_party/libwebrtc/sdk/objc/", - "/third_party/libwebrtc/sdk/objc/base/", - "/tools/profiler/public" -] - -UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/mac/desktop_configuration.mm", - "/third_party/libwebrtc/modules/desktop_capture/mac/desktop_frame_cgimage.mm", - "/third_party/libwebrtc/modules/desktop_capture/mac/desktop_frame_iosurface.mm", - "/third_party/libwebrtc/modules/desktop_capture/mac/desktop_frame_provider.mm", - "/third_party/libwebrtc/modules/desktop_capture/mac/sck_picker_handle.mm", - "/third_party/libwebrtc/modules/desktop_capture/mac/screen_capturer_mac.mm", - "/third_party/libwebrtc/modules/desktop_capture/mac/screen_capturer_sck.mm", - "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_mac.mm", - "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_darwin.mm", - "/third_party/libwebrtc/modules/desktop_capture/window_capturer_mac.mm", - "/third_party/libwebrtc/modules/desktop_capture/window_finder_mac.mm" -] - -if not CONFIG["MOZ_DEBUG"]: - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" - DEFINES["NDEBUG"] = True - DEFINES["NVALGRIND"] = True - -if CONFIG["MOZ_DEBUG"] == "1": - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" - DEFINES["_DEBUG"] = True - -if CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - DEFINES["__ARM_NEON__"] = "1" - -if CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - -Library("desktop_capture_objc_gn") diff --git third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build -index 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 +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["_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 - 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": -@@ -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" -if CONFIG["TARGET_CPU"] == "arm": - - CXXFLAGS += [ - "-mfpu=neon" - ] - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - DEFINES["_GNU_SOURCE"] = 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"] == "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"] == "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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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 +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["_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 - 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": +@@ -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 - -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("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 +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["_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 - 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 += [ - "GLESv2", - "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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 -DEFINES["USE_AURA"] = "1" DEFINES["USE_GLIB"] = "1" DEFINES["USE_OZONE"] = "1" -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 DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" DEFINES["WEBRTC_POSIX"] = True 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" -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"] == "mips32": 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 +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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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" 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["_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" - -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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True 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" -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": -@@ -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 -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("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 +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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": - -- 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": -@@ -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" -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" - ] - +- 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" -- ] -- + 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": -@@ -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" -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("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 +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["_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 - 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 += [ - "GLESv2", - "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": -@@ -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" -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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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" 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["_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" - -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": -@@ -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" -if CONFIG["TARGET_CPU"] == "arm": - - CFLAGS += [ - "-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": - - CFLAGS += [ - "-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": - CFLAGS += [ "-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("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" 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["_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" - -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": -@@ -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" -if CONFIG["TARGET_CPU"] == "arm": - - CFLAGS += [ - "-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": - - CFLAGS += [ - "-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": - CFLAGS += [ "-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("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" 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["_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" - -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": -@@ -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" -if CONFIG["TARGET_CPU"] == "arm": - - CFLAGS += [ - "-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": - - CFLAGS += [ - "-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": - CFLAGS += [ "-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("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" 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["_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 - 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" - ] - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/utility/source/helpers_android.cc" - ] - -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": -@@ -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" -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": -@@ -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 -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"] == "arm": - - CXXFLAGS += [ - "-mfpu=neon" - ] - -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": - - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["_GNU_SOURCE"] = True - Library("utility_gn") diff --git third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build -index 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 +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["_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 += [ + "/third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc", + "/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc", + "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc", + "/third_party/libwebrtc/modules/video_capture/linux/video_capture_v4l2.cc", "/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 - 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 - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc", - "/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc", - "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc", - "/third_party/libwebrtc/modules/video_capture/linux/video_capture_v4l2.cc" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - -- 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 - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc", - "/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc", - "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc", - "/third_party/libwebrtc/modules/video_capture/linux/video_capture_v4l2.cc" - ] - -if CONFIG["OS_TARGET"] == "WINNT": - -- 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", - "ole32", - "oleaut32", - "secur32", - "strmiids", - "user32", - "winmm" - ] - - SOURCES += [ - "/third_party/libwebrtc/modules/video_capture/windows/device_info_ds.cc", - "/third_party/libwebrtc/modules/video_capture/windows/help_functions_ds.cc", - "/third_party/libwebrtc/modules/video_capture/windows/sink_filter_ds.cc" - ] - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/video_capture/windows/video_capture_ds.cc", - "/third_party/libwebrtc/modules/video_capture/windows/video_capture_factory_windows.cc" - ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_ARCH_ARM64"] = True 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["WEBRTC_USE_PIPEWIRE"] = True +- DEFINES["WEBRTC_USE_PIPEWIRE"] = True - DEFINES["_GNU_SOURCE"] = True - - LOCAL_INCLUDES += [ - "/third_party/libepoxy/libepoxy/include/", - "/third_party/libwebrtc/third_party/libepoxy/libepoxy/include/" - ] - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/video_capture/linux/camera_portal.cc", - "/third_party/libwebrtc/modules/video_capture/linux/device_info_pipewire.cc", - "/third_party/libwebrtc/modules/video_capture/linux/pipewire_session.cc", - "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc" - ] - -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" ] -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": +if CONFIG["TARGET_CPU"] == "mips32": + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True DEFINES["WEBRTC_USE_PIPEWIRE"] = True - DEFINES["_GNU_SOURCE"] = True 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" ] -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm": +if CONFIG["TARGET_CPU"] == "mips64": DEFINES["WEBRTC_USE_PIPEWIRE"] = True - DEFINES["_GNU_SOURCE"] = True 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" ] -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": +if CONFIG["TARGET_CPU"] == "x86": CXXFLAGS += [ "-msse2" ] + DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_USE_PIPEWIRE"] = True - DEFINES["_GNU_SOURCE"] = True 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" ] -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": +if CONFIG["TARGET_CPU"] == "x86_64": + DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_USE_PIPEWIRE"] = True - DEFINES["_GNU_SOURCE"] = True 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 +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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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 += [ +- "GLESv2", - "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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("frame_helpers_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 ---- 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" +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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": -@@ -162,82 +68,21 @@ 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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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": +@@ -141,82 +64,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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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": -@@ -168,82 +74,21 @@ 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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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": -@@ -154,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -147,82 +70,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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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,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 - 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 += [ -- "GLESv2", - "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": -@@ -162,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" -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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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 += [ +- "GLESv2", - "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": +@@ -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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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,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 - 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": -@@ -154,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" -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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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": +@@ -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 - -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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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": +@@ -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 - -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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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": +@@ -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 - -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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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,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 - 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": -@@ -154,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" -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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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": +@@ -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 - -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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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": -@@ -163,82 +69,21 @@ 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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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 += [ -- "GLESv2", - "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": -@@ -175,82 +80,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -142,82 +65,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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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 += [ - "GLESv2", - "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": -@@ -174,82 +79,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -154,82 +76,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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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 += [ - "GLESv2", - "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": -@@ -167,82 +72,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -153,82 +75,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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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 += [ +- "GLESv2", - "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": -@@ -157,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -146,82 +68,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("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 ---- 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" + 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 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 +@@ -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 +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["_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"]: +@@ -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 - 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 += [ -- "GLESv2", - "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": -@@ -168,82 +73,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -136,82 +66,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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -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 +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["_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"]: +@@ -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 - 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 += [ +- "GLESv2", - "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": - +- 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": + +@@ -147,82 +69,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:c++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("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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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" - 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": +@@ -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 - -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("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 +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["_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 - 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 += [ - "GLESv2", - "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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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 += [ - "GLESv2", - "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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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", + "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", + "/third_party/libwebrtc/modules/desktop_capture/primitives_gn", "/third_party/libwebrtc/modules/module_api_gn", "/third_party/libwebrtc/modules/module_api_public_gn", "/third_party/libwebrtc/modules/module_fec_api_gn", -@@ -516,138 +518,30 @@ DIRS += [ +@@ -517,138 +519,30 @@ DIRS += [ "/third_party/libwebrtc/webrtc_gn" ] -if CONFIG["OS_TARGET"] == "Android": - - DIRS += [ - "/third_party/libwebrtc/rtc_base/ifaddrs_android_gn", - "/third_party/libwebrtc/third_party/cpu_features/ndk_compat_gn" - ] - -if CONFIG["OS_TARGET"] == "Darwin": - - DIRS += [ - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn", - "/third_party/libwebrtc/modules/desktop_capture/primitives_gn", - "/third_party/libwebrtc/rtc_base/system/cocoa_threading_gn", - "/third_party/libwebrtc/rtc_base/system/gcd_helpers_gn", - "/third_party/libwebrtc/sdk/base_objc_gn", - "/third_party/libwebrtc/sdk/helpers_objc_gn", - "/third_party/libwebrtc/sdk/videocapture_objc_gn", - "/third_party/libwebrtc/sdk/videoframebuffer_objc_gn" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DIRS += [ - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", - "/third_party/libwebrtc/modules/desktop_capture/primitives_gn" - ] - -if CONFIG["OS_TARGET"] == "WINNT": - - DIRS += [ - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", - "/third_party/libwebrtc/modules/desktop_capture/primitives_gn", - "/third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn", - "/third_party/libwebrtc/rtc_base/win/get_activation_factory_gn", - "/third_party/libwebrtc/rtc_base/win/hstring_gn", - "/third_party/libwebrtc/rtc_base/win/windows_version_gn", - "/third_party/libwebrtc/rtc_base/win32_gn" - ] - -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "aarch64": - - DIRS += [ - "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", - "/third_party/libwebrtc/common_audio/common_audio_neon_gn" - ] - -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - DIRS += [ - "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", - "/third_party/libwebrtc/common_audio/common_audio_neon_gn", - "/third_party/libwebrtc/rtc_base/system/asm_defines_gn" - ] - -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86": - - DIRS += [ - "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", - "/third_party/libwebrtc/common_audio/common_audio_sse2_gn", - "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn", - "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn" - ] - -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86_64": - - DIRS += [ - "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", - "/third_party/libwebrtc/common_audio/common_audio_sse2_gn", - "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn", - "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn" - ] - -if CONFIG["OS_TARGET"] == "Darwin" and CONFIG["TARGET_CPU"] == "aarch64": - - DIRS += [ - "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", - "/third_party/libwebrtc/common_audio/common_audio_neon_gn" - ] - -if CONFIG["OS_TARGET"] == "Darwin" and CONFIG["TARGET_CPU"] == "x86_64": - - DIRS += [ - "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", - "/third_party/libwebrtc/common_audio/common_audio_sse2_gn", - "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn", - "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn", - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn" - ] - -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": +if CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "aarch64": DIRS += [ "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", "/third_party/libwebrtc/common_audio/common_audio_neon_gn", - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", - "/third_party/libwebrtc/modules/desktop_capture/primitives_gn", "/third_party/libwebrtc/modules/portal/portal_gn", "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn" ] -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm": +if CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "mips32": DIRS += [ - "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", - "/third_party/libwebrtc/common_audio/common_audio_neon_gn", - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", - "/third_party/libwebrtc/modules/desktop_capture/primitives_gn", - "/third_party/libwebrtc/modules/portal/portal_gn", - "/third_party/libwebrtc/rtc_base/system/asm_defines_gn", - "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn" - ] - -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips32": - - DIRS += [ - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", - "/third_party/libwebrtc/modules/desktop_capture/primitives_gn", "/third_party/libwebrtc/modules/portal/portal_gn", "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn" ] -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips64": +if CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "mips64": DIRS += [ - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", - "/third_party/libwebrtc/modules/desktop_capture/primitives_gn", "/third_party/libwebrtc/modules/portal/portal_gn", "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn" ] -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": +if CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "x86": 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", - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", - "/third_party/libwebrtc/modules/desktop_capture/primitives_gn", "/third_party/libwebrtc/modules/portal/portal_gn", "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn" ] -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": +if CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "x86_64": 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", - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", - "/third_party/libwebrtc/modules/desktop_capture/primitives_gn", "/third_party/libwebrtc/modules/portal/portal_gn", "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn" ] - -if CONFIG["OS_TARGET"] == "OpenBSD" and CONFIG["TARGET_CPU"] == "aarch64": - - DIRS += [ - "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", - "/third_party/libwebrtc/common_audio/common_audio_neon_gn" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD" and CONFIG["TARGET_CPU"] == "x86_64": - - DIRS += [ - "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", - "/third_party/libwebrtc/common_audio/common_audio_sse2_gn", - "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn", - "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn", - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn" - ] - -if CONFIG["OS_TARGET"] == "WINNT" and CONFIG["TARGET_CPU"] == "aarch64": - - DIRS += [ - "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", - "/third_party/libwebrtc/common_audio/common_audio_neon_gn" - ] - -if CONFIG["OS_TARGET"] == "WINNT" and CONFIG["TARGET_CPU"] == "x86": - - DIRS += [ - "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", - "/third_party/libwebrtc/common_audio/common_audio_sse2_gn", - "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn", - "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn", - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn" - ] - -if CONFIG["OS_TARGET"] == "WINNT" and CONFIG["TARGET_CPU"] == "x86_64": - - DIRS += [ - "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", - "/third_party/libwebrtc/common_audio/common_audio_sse2_gn", - "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn", - "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn", - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn" - ] - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "loongarch64": - - DIRS += [ - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", - "/third_party/libwebrtc/modules/desktop_capture/primitives_gn" - ] - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "ppc64": - - DIRS += [ - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", - "/third_party/libwebrtc/modules/desktop_capture/primitives_gn" - ] - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64": - - DIRS += [ - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", - "/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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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 +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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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 - -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("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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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 +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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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 - -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("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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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" 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["_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" - -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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True 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" -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": -@@ -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 -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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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" 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["_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" - -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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True 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" -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": -@@ -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 -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("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 +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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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 - -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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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 - -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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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" 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["_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" - -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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True 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" -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": -@@ -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 -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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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 += [ - "GLESv2", - "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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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 +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["_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 - 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": +@@ -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 - -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("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 +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["_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 - 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": +@@ -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 - -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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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 - -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("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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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 +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["_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 - 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": +@@ -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 - -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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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 +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["_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 - 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": - +- 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": + +@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": + DEFINES["WEBRTC_HAS_NEON"] = True + DEFINES["__ARM_NEON__"] = "1" + +-if CONFIG["TARGET_CPU"] == "arm": +- - CXXFLAGS += [ -- "-std:c++20" +- "-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("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 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" + 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 +- 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": -@@ -154,82 +67,21 @@ 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": - -- 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("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 ---- 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" - 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": +@@ -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("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 +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["_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 - 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": +@@ -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 - -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("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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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 +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["_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 - 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": +@@ -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 - -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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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 - -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("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 +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["_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 - 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": +@@ -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 - -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("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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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 +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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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 +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["_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 - 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": +@@ -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 - -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("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/. - - - ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### - ### DO NOT edit it by hand. ### - -COMPILE_FLAGS["OS_INCLUDES"] = [] -AllowCompilerWarnings() - --CXXFLAGS += [ -- "-std=gnu++20" --] -- -DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" -DEFINES["ANDROID"] = True -DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1" -DEFINES["HAVE_SYS_UIO_H"] = True -DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True -DEFINES["RTC_ENABLE_VP9"] = True -DEFINES["WEBRTC_ANDROID"] = True -DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" +-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True -DEFINES["WEBRTC_LIBRARY_IMPL"] = True -DEFINES["WEBRTC_LINUX"] = True -DEFINES["WEBRTC_MOZILLA_BUILD"] = True -DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" -DEFINES["WEBRTC_POSIX"] = True -DEFINES["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 - -FINAL_LIBRARY = "xul" - - -LOCAL_INCLUDES += [ - "!/dist/include/libwebrtc_overrides", - "!/ipc/ipdl/_ipdlheaders", - "!/third_party/libwebrtc/gen", - "/ipc/chromium/src", - "/third_party/abseil-cpp/", - "/third_party/libwebrtc/", - "/tools/profiler/public" -] - -OS_LIBS += [ - "GLESv2", - "log" -] - -UNIFIED_SOURCES += [ - "/third_party/libwebrtc/rtc_base/ifaddrs_android.cc" -] - -if not CONFIG["MOZ_DEBUG"]: - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" - DEFINES["NDEBUG"] = True - DEFINES["NVALGRIND"] = True - -if CONFIG["MOZ_DEBUG"] == "1": - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" - DEFINES["_DEBUG"] = True - -if CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - 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"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - -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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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 +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["_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 - 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 += [ - "GLESv2", - "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" - ] + DEFINES["_DEBUG"] = True 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" -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" -- ] -- + 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" - ] - +- 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("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 +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" 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" +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" -@@ -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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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 +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["_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 - 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": +@@ -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 - -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("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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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 +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["_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 - 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 += [ - "GLESv2", - "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" - ] + DEFINES["_DEBUG"] = True 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" -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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": - -- 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": -@@ -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" -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" - ] - +- 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" -- ] -- + 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("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 +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["_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 - 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": +@@ -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 - -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("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 +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["_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 - 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": +@@ -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 - -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("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 +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["_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 - 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 += [ - "GLESv2", - "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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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 - -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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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 +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["_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 - 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": +@@ -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 - -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("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 +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["_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 - 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": +@@ -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 - -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("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 +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["_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 - 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": - +- 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 += [ -- "-std:c++20" +- "-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("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 71d485c13568..a544f01597c0 100644 +--- third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build ++++ third_party/libwebrtc/rtc_base/rate_statistics_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 +- +- 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 75698c8db945..c4fea54c2bff 100644 +--- third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build ++++ third_party/libwebrtc/rtc_base/rate_tracker_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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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" 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["_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"]: +@@ -42,82 +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 - 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": +@@ -125,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 - -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 -- +@@ -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"] == "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("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 ---- third_party/libwebrtc/rtc_base/refcount_gn/moz.build -+++ third_party/libwebrtc/rtc_base/refcount_gn/moz.build +- + 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 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" 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["_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,86 +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 - +- 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["_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": +@@ -129,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": +@@ -157,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("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 ---- third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build -+++ third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build + 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 5a2ddf7b5535..52f42d277da4 100644 +--- third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build ++++ third_party/libwebrtc/rtc_base/rtc_event_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["_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" - -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["_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": -@@ -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 - -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": -@@ -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 - -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": - -- 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("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 ---- 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() ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + 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 31383355abe5..41f7c59fb1c4 100644 +--- third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build ++++ third_party/libwebrtc/rtc_base/rtc_numerics_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["_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"]: +@@ -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 - 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": +@@ -135,82 +65,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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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"]: +@@ -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 - 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": -@@ -156,82 +69,21 @@ 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["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("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 ---- 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" + 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 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" 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["_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["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("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 ---- 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" - 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"]: +@@ -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["_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": +@@ -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": -@@ -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 -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("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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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 +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["_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 - 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": +@@ -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 - -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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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 +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["_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 - 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 += [ - "GLESv2", - "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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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" 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["_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" - -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 += [ - "GLESv2", - "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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True 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" -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": -@@ -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 -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("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 +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["_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 - 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 += [ - "GLESv2", - "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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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" 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["_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" - -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 += [ - "GLESv2", - "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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True 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" -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": -@@ -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 -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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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 +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["_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 - 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": -@@ -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" -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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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 +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["_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 - 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": +@@ -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 - -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("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 +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["_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 - 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": - -- 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": -@@ -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" -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" - ] - +- 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" -- ] -- + 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("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 +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["_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 - 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": +@@ -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 - -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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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/. - - - ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### - ### DO NOT edit it by hand. ### - -COMPILE_FLAGS["OS_INCLUDES"] = [] -AllowCompilerWarnings() - -DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" -DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True -DEFINES["RTC_ENABLE_VP9"] = True -DEFINES["WEBRTC_ARCH_ARM"] = True -DEFINES["WEBRTC_ARCH_ARM_V7"] = True -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" +-DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True -DEFINES["WEBRTC_HAS_NEON"] = True -DEFINES["WEBRTC_LIBRARY_IMPL"] = True -DEFINES["WEBRTC_LINUX"] = True -DEFINES["WEBRTC_MOZILLA_BUILD"] = True -DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" -DEFINES["WEBRTC_POSIX"] = True -DEFINES["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 - -FINAL_LIBRARY = "xul" - - -LOCAL_INCLUDES += [ - "!/dist/include/libwebrtc_overrides", - "!/ipc/ipdl/_ipdlheaders", - "!/third_party/libwebrtc/gen", - "/ipc/chromium/src", - "/third_party/abseil-cpp/", - "/third_party/libwebrtc/", - "/tools/profiler/public" -] - -if not CONFIG["MOZ_DEBUG"]: - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" - DEFINES["NDEBUG"] = True - DEFINES["NVALGRIND"] = True - -if CONFIG["MOZ_DEBUG"] == "1": - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" - DEFINES["_DEBUG"] = True - -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True - DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True - DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True - -if CONFIG["OS_TARGET"] == "Linux": - - DEFINES["USE_AURA"] = "1" - DEFINES["USE_GLIB"] = "1" - 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 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - - - ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### - ### DO NOT edit it by hand. ### - -CMMFLAGS += [ - "-fobjc-arc" -] - -COMPILE_FLAGS["OS_INCLUDES"] = [] -AllowCompilerWarnings() - -DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" -DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" -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 - -FINAL_LIBRARY = "xul" - - -LOCAL_INCLUDES += [ - "!/dist/include/libwebrtc_overrides", - "!/ipc/ipdl/_ipdlheaders", - "!/third_party/libwebrtc/gen", - "/ipc/chromium/src", - "/third_party/abseil-cpp/", - "/third_party/libwebrtc/", - "/tools/profiler/public" -] - -UNIFIED_SOURCES += [ - "/third_party/libwebrtc/rtc_base/system/cocoa_threading.mm" -] - -if not CONFIG["MOZ_DEBUG"]: - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" - DEFINES["NDEBUG"] = True - DEFINES["NVALGRIND"] = True - -if CONFIG["MOZ_DEBUG"] == "1": - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" - DEFINES["_DEBUG"] = True - -if CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - DEFINES["__ARM_NEON__"] = "1" - -if CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - -Library("cocoa_threading_gn") diff --git third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build -index 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 +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["_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 - 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": +@@ -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 - -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("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 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - - - ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### - ### DO NOT edit it by hand. ### - -CMFLAGS += [ - "-fobjc-arc" -] - -COMPILE_FLAGS["OS_INCLUDES"] = [] -AllowCompilerWarnings() - -DEFINES["ABSL_ALLOCATOR_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["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 - -FINAL_LIBRARY = "xul" - - -LOCAL_INCLUDES += [ - "!/dist/include/libwebrtc_overrides", - "!/ipc/ipdl/_ipdlheaders", - "!/third_party/libwebrtc/gen", - "/ipc/chromium/src", - "/third_party/abseil-cpp/", - "/third_party/libwebrtc/", - "/tools/profiler/public" -] - -UNIFIED_SOURCES += [ - "/third_party/libwebrtc/rtc_base/system/gcd_helpers.m" -] - -if not CONFIG["MOZ_DEBUG"]: - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" - DEFINES["NDEBUG"] = True - DEFINES["NVALGRIND"] = True - -if CONFIG["MOZ_DEBUG"] == "1": - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" - DEFINES["_DEBUG"] = True - -if CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - DEFINES["__ARM_NEON__"] = "1" - -if CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - -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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": - -- 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": -@@ -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" -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" - ] - +- 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" -- ] -- + 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("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 +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["_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 - 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 += [ - "GLESv2", - "log" - ] - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/rtc_base/physical_socket_server.cc" - ] - -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 - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/rtc_base/physical_socket_server.cc" - ] - -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 - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/rtc_base/physical_socket_server.cc" - ] - -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" - ] - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/rtc_base/physical_socket_server.cc" - ] + DEFINES["_DEBUG"] = True 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" -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("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 +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_EXCLUDE_SYSTEM_TIME"] = 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["_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 - 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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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" 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["_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" - -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["_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": -@@ -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" -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": -@@ -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 -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("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 +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["_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 - 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": +@@ -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 - -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("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/. - - - ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### - ### DO NOT edit it by hand. ### - -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 -DEFINES["NTDDI_VERSION"] = "0x0A000000" -DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" -DEFINES["PSAPI_VERSION"] = "2" -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True -DEFINES["RTC_ENABLE_VP9"] = True -DEFINES["RTC_ENABLE_WIN_WGC"] = True -DEFINES["UNICODE"] = True -DEFINES["USE_AURA"] = "1" -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" +-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_STRICT_FIELD_TRIALS"] = "0" -DEFINES["WEBRTC_WIN"] = True -DEFINES["WIN32"] = True -DEFINES["WIN32_LEAN_AND_MEAN"] = True -DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" -DEFINES["WINVER"] = "0x0A00" -DEFINES["_ATL_NO_OPENGL"] = True -DEFINES["_CRT_NONSTDC_NO_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["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE" -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 - -FINAL_LIBRARY = "xul" - - -LOCAL_INCLUDES += [ - "!/dist/include/libwebrtc_overrides", - "!/ipc/ipdl/_ipdlheaders", - "!/third_party/libwebrtc/gen", - "/ipc/chromium/src", - "/third_party/abseil-cpp/", - "/third_party/libwebrtc/", - "/tools/profiler/public" -] - -UNIFIED_SOURCES += [ - "/third_party/libwebrtc/rtc_base/win/create_direct3d_device.cc" -] - -if not CONFIG["MOZ_DEBUG"]: - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" - DEFINES["NDEBUG"] = True - DEFINES["NVALGRIND"] = True - -if CONFIG["MOZ_DEBUG"] == "1": - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - DEFINES["__ARM_NEON__"] = "1" - -if CONFIG["TARGET_CPU"] == "x86": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - -Library("create_direct3d_device_gn") diff --git third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build deleted file mode 100644 -index 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/. +- +- +- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### +- ### DO NOT edit it by hand. ### +- +-COMPILE_FLAGS["OS_INCLUDES"] = [] +-AllowCompilerWarnings() +- +-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +-DEFINES["NOMINMAX"] = True +-DEFINES["NTDDI_VERSION"] = "0x0A000000" +-DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" +-DEFINES["PSAPI_VERSION"] = "2" +-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True +-DEFINES["RTC_ENABLE_VP9"] = True +-DEFINES["RTC_ENABLE_WIN_WGC"] = True +-DEFINES["UNICODE"] = True +-DEFINES["USE_AURA"] = "1" +-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" +-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_STRICT_FIELD_TRIALS"] = "0" +-DEFINES["WEBRTC_WIN"] = True +-DEFINES["WIN32"] = True +-DEFINES["WIN32_LEAN_AND_MEAN"] = True +-DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +-DEFINES["WINVER"] = "0x0A00" +-DEFINES["_ATL_NO_OPENGL"] = True +-DEFINES["_CRT_NONSTDC_NO_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 +- +-FINAL_LIBRARY = "xul" +- +- +-LOCAL_INCLUDES += [ +- "!/dist/include/libwebrtc_overrides", +- "!/ipc/ipdl/_ipdlheaders", +- "!/third_party/libwebrtc/gen", +- "/ipc/chromium/src", +- "/third_party/abseil-cpp/", +- "/third_party/libwebrtc/", +- "/tools/profiler/public" +-] +- +-UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/rtc_base/win/get_activation_factory.cc" +-] +- +-if not CONFIG["MOZ_DEBUG"]: +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" +- DEFINES["NDEBUG"] = True +- DEFINES["NVALGRIND"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1": +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["TARGET_CPU"] == "aarch64": +- +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- DEFINES["__ARM_NEON__"] = "1" +- +-if CONFIG["TARGET_CPU"] == "x86": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["TARGET_CPU"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-Library("get_activation_factory_gn") +diff --git third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build +deleted file mode 100644 +index 348b1af0ac91..000000000000 +--- third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build ++++ /dev/null +@@ -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/. - - - ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### - ### DO NOT edit it by hand. ### - -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 +-DEFINES["NTDDI_VERSION"] = "0x0A000000" +-DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" +-DEFINES["PSAPI_VERSION"] = "2" +-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True +-DEFINES["RTC_ENABLE_VP9"] = True +-DEFINES["RTC_ENABLE_WIN_WGC"] = True +-DEFINES["UNICODE"] = True +-DEFINES["USE_AURA"] = "1" +-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" +-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_STRICT_FIELD_TRIALS"] = "0" +-DEFINES["WEBRTC_WIN"] = True +-DEFINES["WIN32"] = True +-DEFINES["WIN32_LEAN_AND_MEAN"] = True +-DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +-DEFINES["WINVER"] = "0x0A00" +-DEFINES["_ATL_NO_OPENGL"] = True +-DEFINES["_CRT_NONSTDC_NO_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 +- +-FINAL_LIBRARY = "xul" +- +- +-LOCAL_INCLUDES += [ +- "!/dist/include/libwebrtc_overrides", +- "!/ipc/ipdl/_ipdlheaders", +- "!/third_party/libwebrtc/gen", +- "/ipc/chromium/src", +- "/third_party/abseil-cpp/", +- "/third_party/libwebrtc/", +- "/tools/profiler/public" +-] +- +-SOURCES += [ +- "/third_party/libwebrtc/rtc_base/win/hstring.cc" -] - +-if not CONFIG["MOZ_DEBUG"]: +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" +- DEFINES["NDEBUG"] = True +- DEFINES["NVALGRIND"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1": +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["TARGET_CPU"] == "aarch64": +- +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- DEFINES["__ARM_NEON__"] = "1" +- +-if CONFIG["TARGET_CPU"] == "x86": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["TARGET_CPU"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-Library("hstring_gn") +diff --git third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build +deleted file mode 100644 +index 0d55a7962fdf..000000000000 +--- third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build ++++ /dev/null +@@ -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/. +- +- +- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### +- ### DO NOT edit it by hand. ### +- +-COMPILE_FLAGS["OS_INCLUDES"] = [] +-AllowCompilerWarnings() +- -DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" -DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True -DEFINES["NOMINMAX"] = True -DEFINES["NTDDI_VERSION"] = "0x0A000000" -DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" -DEFINES["PSAPI_VERSION"] = "2" -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True -DEFINES["RTC_ENABLE_VP9"] = True -DEFINES["RTC_ENABLE_WIN_WGC"] = True -DEFINES["UNICODE"] = True -DEFINES["USE_AURA"] = "1" -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" +-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_STRICT_FIELD_TRIALS"] = "0" -DEFINES["WEBRTC_WIN"] = True -DEFINES["WIN32"] = True -DEFINES["WIN32_LEAN_AND_MEAN"] = True -DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" -DEFINES["WINVER"] = "0x0A00" -DEFINES["_ATL_NO_OPENGL"] = True -DEFINES["_CRT_NONSTDC_NO_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["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE" -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 - -FINAL_LIBRARY = "xul" - - -LOCAL_INCLUDES += [ - "!/dist/include/libwebrtc_overrides", - "!/ipc/ipdl/_ipdlheaders", - "!/third_party/libwebrtc/gen", - "/ipc/chromium/src", - "/third_party/abseil-cpp/", - "/third_party/libwebrtc/", - "/tools/profiler/public" -] - -UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/rtc_base/win/get_activation_factory.cc" --] -- --if not CONFIG["MOZ_DEBUG"]: -- -- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" -- DEFINES["NDEBUG"] = True -- DEFINES["NVALGRIND"] = True -- --if CONFIG["MOZ_DEBUG"] == "1": -- -- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" -- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" -- --if CONFIG["TARGET_CPU"] == "aarch64": -- -- DEFINES["WEBRTC_ARCH_ARM64"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True -- DEFINES["__ARM_NEON__"] = "1" -- --if CONFIG["TARGET_CPU"] == "x86": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- --if CONFIG["TARGET_CPU"] == "x86_64": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- --Library("get_activation_factory_gn") -diff --git third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build -deleted file mode 100644 -index 5a69bc248233..000000000000 ---- third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build -+++ /dev/null -@@ -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/. -- -- -- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### -- ### DO NOT edit it by hand. ### -- --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 --DEFINES["NTDDI_VERSION"] = "0x0A000000" --DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" --DEFINES["PSAPI_VERSION"] = "2" --DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True --DEFINES["RTC_ENABLE_VP9"] = True --DEFINES["RTC_ENABLE_WIN_WGC"] = True --DEFINES["UNICODE"] = True --DEFINES["USE_AURA"] = "1" --DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" --DEFINES["WEBRTC_LIBRARY_IMPL"] = True --DEFINES["WEBRTC_MOZILLA_BUILD"] = True --DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" --DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" --DEFINES["WEBRTC_WIN"] = True --DEFINES["WIN32"] = True --DEFINES["WIN32_LEAN_AND_MEAN"] = True --DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" --DEFINES["WINVER"] = "0x0A00" --DEFINES["_ATL_NO_OPENGL"] = True --DEFINES["_CRT_NONSTDC_NO_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["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE" --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 -- --FINAL_LIBRARY = "xul" -- -- --LOCAL_INCLUDES += [ -- "!/dist/include/libwebrtc_overrides", -- "!/ipc/ipdl/_ipdlheaders", -- "!/third_party/libwebrtc/gen", -- "/ipc/chromium/src", -- "/third_party/abseil-cpp/", -- "/third_party/libwebrtc/", -- "/tools/profiler/public" --] -- --SOURCES += [ -- "/third_party/libwebrtc/rtc_base/win/hstring.cc" --] -- --if not CONFIG["MOZ_DEBUG"]: -- -- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" -- DEFINES["NDEBUG"] = True -- DEFINES["NVALGRIND"] = True -- --if CONFIG["MOZ_DEBUG"] == "1": -- -- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" -- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" -- --if CONFIG["TARGET_CPU"] == "aarch64": -- -- DEFINES["WEBRTC_ARCH_ARM64"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True -- DEFINES["__ARM_NEON__"] = "1" -- --if CONFIG["TARGET_CPU"] == "x86": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- --if CONFIG["TARGET_CPU"] == "x86_64": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- --Library("hstring_gn") -diff --git third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build -deleted file mode 100644 -index 1b6458e538a7..000000000000 ---- third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build -+++ /dev/null -@@ -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/. -- -- -- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### -- ### DO NOT edit it by hand. ### -- --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 --DEFINES["NTDDI_VERSION"] = "0x0A000000" --DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" --DEFINES["PSAPI_VERSION"] = "2" --DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True --DEFINES["RTC_ENABLE_VP9"] = True --DEFINES["RTC_ENABLE_WIN_WGC"] = True --DEFINES["UNICODE"] = True --DEFINES["USE_AURA"] = "1" --DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" --DEFINES["WEBRTC_LIBRARY_IMPL"] = True --DEFINES["WEBRTC_MOZILLA_BUILD"] = True --DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" --DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" --DEFINES["WEBRTC_WIN"] = True --DEFINES["WIN32"] = True --DEFINES["WIN32_LEAN_AND_MEAN"] = True --DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" --DEFINES["WINVER"] = "0x0A00" --DEFINES["_ATL_NO_OPENGL"] = True --DEFINES["_CRT_NONSTDC_NO_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["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE" --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 -- --FINAL_LIBRARY = "xul" -- -- --LOCAL_INCLUDES += [ -- "!/dist/include/libwebrtc_overrides", -- "!/ipc/ipdl/_ipdlheaders", -- "!/third_party/libwebrtc/gen", -- "/ipc/chromium/src", -- "/third_party/abseil-cpp/", -- "/third_party/libwebrtc/", -- "/tools/profiler/public" --] -- --UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/rtc_base/win/windows_version.cc" +- "/third_party/libwebrtc/rtc_base/win/windows_version.cc" -] - -if not CONFIG["MOZ_DEBUG"]: - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" - DEFINES["NDEBUG"] = True - DEFINES["NVALGRIND"] = True - -if CONFIG["MOZ_DEBUG"] == "1": - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - DEFINES["__ARM_NEON__"] = "1" - -if CONFIG["TARGET_CPU"] == "x86": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - -Library("windows_version_gn") diff --git third_party/libwebrtc/rtc_base/win32_gn/moz.build third_party/libwebrtc/rtc_base/win32_gn/moz.build deleted file mode 100644 -index 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/. - - - ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### - ### DO NOT edit it by hand. ### - -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 -DEFINES["NTDDI_VERSION"] = "0x0A000000" -DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" -DEFINES["PSAPI_VERSION"] = "2" -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True -DEFINES["RTC_ENABLE_VP9"] = True -DEFINES["RTC_ENABLE_WIN_WGC"] = True -DEFINES["UNICODE"] = True -DEFINES["USE_AURA"] = "1" -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" +-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_STRICT_FIELD_TRIALS"] = "0" -DEFINES["WEBRTC_WIN"] = True -DEFINES["WIN32"] = True -DEFINES["WIN32_LEAN_AND_MEAN"] = True -DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" -DEFINES["WINVER"] = "0x0A00" -DEFINES["_ATL_NO_OPENGL"] = True -DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True -DEFINES["_CRT_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["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE" -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 - -FINAL_LIBRARY = "xul" - - -LOCAL_INCLUDES += [ - "!/dist/include/libwebrtc_overrides", - "!/ipc/ipdl/_ipdlheaders", - "!/third_party/libwebrtc/gen", - "/ipc/chromium/src", - "/third_party/abseil-cpp/", - "/third_party/libwebrtc/", - "/tools/profiler/public" -] - -OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32" -] - -UNIFIED_SOURCES += [ - "/third_party/libwebrtc/rtc_base/win32.cc" -] - -if not CONFIG["MOZ_DEBUG"]: - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" - DEFINES["NDEBUG"] = True - DEFINES["NVALGRIND"] = True - -if CONFIG["MOZ_DEBUG"] == "1": - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - DEFINES["__ARM_NEON__"] = "1" - -if CONFIG["TARGET_CPU"] == "x86": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - -Library("win32_gn") diff --git third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build -index 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 +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["_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 - 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": +@@ -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 - -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("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 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - - - ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### - ### DO NOT edit it by hand. ### - -CMFLAGS += [ - "-fobjc-arc" -] - -CMMFLAGS += [ - "-fobjc-arc" -] - -COMPILE_FLAGS["OS_INCLUDES"] = [] -AllowCompilerWarnings() - -DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" -DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" -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 - -FINAL_LIBRARY = "xul" - - -LOCAL_INCLUDES += [ - "!/dist/include/libwebrtc_overrides", - "!/ipc/ipdl/_ipdlheaders", - "!/third_party/libwebrtc/gen", - "/ipc/chromium/src", - "/third_party/abseil-cpp/", - "/third_party/libwebrtc/", - "/third_party/libwebrtc/sdk/objc/", - "/third_party/libwebrtc/sdk/objc/base/", - "/tools/profiler/public" -] - -UNIFIED_SOURCES += [ - "/third_party/libwebrtc/sdk/objc/base/RTCEncodedImage.m", - "/third_party/libwebrtc/sdk/objc/base/RTCLogging.mm", - "/third_party/libwebrtc/sdk/objc/base/RTCVideoCapturer.m", - "/third_party/libwebrtc/sdk/objc/base/RTCVideoCodecInfo.m", - "/third_party/libwebrtc/sdk/objc/base/RTCVideoEncoderFactory.mm", - "/third_party/libwebrtc/sdk/objc/base/RTCVideoEncoderQpThresholds.m", - "/third_party/libwebrtc/sdk/objc/base/RTCVideoEncoderSettings.m", - "/third_party/libwebrtc/sdk/objc/base/RTCVideoFrame.mm" -] - -if not CONFIG["MOZ_DEBUG"]: - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" - DEFINES["NDEBUG"] = True - DEFINES["NVALGRIND"] = True - -if CONFIG["MOZ_DEBUG"] == "1": - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" - DEFINES["_DEBUG"] = True - -if CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - DEFINES["__ARM_NEON__"] = "1" - -if CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - -Library("base_objc_gn") diff --git third_party/libwebrtc/sdk/helpers_objc_gn/moz.build third_party/libwebrtc/sdk/helpers_objc_gn/moz.build deleted file mode 100644 -index 7e8e518da889..000000000000 +index 3a84d3e3c208..000000000000 --- third_party/libwebrtc/sdk/helpers_objc_gn/moz.build +++ /dev/null @@ -1,77 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - - - ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### - ### DO NOT edit it by hand. ### - -CMFLAGS += [ - "-fobjc-arc" -] - -CMMFLAGS += [ - "-fobjc-arc" -] - -COMPILE_FLAGS["OS_INCLUDES"] = [] -AllowCompilerWarnings() - -DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" -DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" -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 - -FINAL_LIBRARY = "xul" - - -LOCAL_INCLUDES += [ - "!/dist/include/libwebrtc_overrides", - "!/ipc/ipdl/_ipdlheaders", - "!/third_party/libwebrtc/gen", - "/ipc/chromium/src", - "/third_party/abseil-cpp/", - "/third_party/libwebrtc/", - "/third_party/libwebrtc/sdk/objc/", - "/third_party/libwebrtc/sdk/objc/base/", - "/tools/profiler/public" -] - -UNIFIED_SOURCES += [ - "/third_party/libwebrtc/sdk/objc/helpers/AVCaptureSession+DevicePosition.mm", - "/third_party/libwebrtc/sdk/objc/helpers/NSString+StdString.mm", - "/third_party/libwebrtc/sdk/objc/helpers/RTCDispatcher.m" -] - -if not CONFIG["MOZ_DEBUG"]: - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" - DEFINES["NDEBUG"] = True - DEFINES["NVALGRIND"] = True - -if CONFIG["MOZ_DEBUG"] == "1": - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" - DEFINES["_DEBUG"] = True - -if CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - DEFINES["__ARM_NEON__"] = "1" - -if CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - -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 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - - - ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### - ### DO NOT edit it by hand. ### - -CMFLAGS += [ - "-fobjc-arc" -] - -COMPILE_FLAGS["OS_INCLUDES"] = [] -AllowCompilerWarnings() - -DEFINES["ABSL_ALLOCATOR_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["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 - -FINAL_LIBRARY = "xul" - - -LOCAL_INCLUDES += [ - "!/dist/include/libwebrtc_overrides", - "!/ipc/ipdl/_ipdlheaders", - "!/third_party/libwebrtc/gen", - "/ipc/chromium/src", - "/third_party/abseil-cpp/", - "/third_party/libwebrtc/", - "/third_party/libwebrtc/sdk/objc/", - "/third_party/libwebrtc/sdk/objc/base/", - "/tools/profiler/public" -] - -UNIFIED_SOURCES += [ - "/third_party/libwebrtc/sdk/objc/components/capturer/RTCCameraVideoCapturer.m", - "/third_party/libwebrtc/sdk/objc/components/capturer/RTCFileVideoCapturer.m" -] - -if not CONFIG["MOZ_DEBUG"]: - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" - DEFINES["NDEBUG"] = True - DEFINES["NVALGRIND"] = True - -if CONFIG["MOZ_DEBUG"] == "1": - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" - DEFINES["_DEBUG"] = True - -if CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - DEFINES["__ARM_NEON__"] = "1" - -if CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - -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 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - - - ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### - ### DO NOT edit it by hand. ### - -CMMFLAGS += [ - "-fobjc-arc" -] - -COMPILE_FLAGS["OS_INCLUDES"] = [] -AllowCompilerWarnings() - -DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" -DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" -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 - -FINAL_LIBRARY = "xul" - - -LOCAL_INCLUDES += [ - "!/dist/include/libwebrtc_overrides", - "!/ipc/ipdl/_ipdlheaders", - "!/third_party/libwebrtc/gen", - "/ipc/chromium/src", - "/media/libyuv/", - "/media/libyuv/libyuv/include/", - "/third_party/abseil-cpp/", - "/third_party/libwebrtc/", - "/third_party/libwebrtc/sdk/objc/", - "/third_party/libwebrtc/sdk/objc/base/", - "/tools/profiler/public" -] - -UNIFIED_SOURCES += [ - "/third_party/libwebrtc/sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer.mm", - "/third_party/libwebrtc/sdk/objc/api/video_frame_buffer/RTCNativeMutableI420Buffer.mm", - "/third_party/libwebrtc/sdk/objc/components/video_frame_buffer/RTCCVPixelBuffer.mm" -] - -if not CONFIG["MOZ_DEBUG"]: - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" - DEFINES["NDEBUG"] = True - DEFINES["NVALGRIND"] = True - -if CONFIG["MOZ_DEBUG"] == "1": - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" - DEFINES["_DEBUG"] = True - -if CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - DEFINES["__ARM_NEON__"] = "1" - -if CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - -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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 +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["_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 - 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": +@@ -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 - -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("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 +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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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" 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["_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" - -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 += [ - "GLESv2", - "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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True 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" -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": -@@ -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 -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("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/. - - - ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### - ### DO NOT edit it by hand. ### - -COMPILE_FLAGS["OS_INCLUDES"] = [] -AllowCompilerWarnings() - -DEFINES["ANDROID"] = True -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 - -FINAL_LIBRARY = "xul" - - -LOCAL_INCLUDES += [ - "!/dist/include/libwebrtc_overrides", - "!/ipc/ipdl/_ipdlheaders", - "!/third_party/libwebrtc/gen", - "/ipc/chromium/src", - "/third_party/libwebrtc/", - "/tools/profiler/public" -] - -if not CONFIG["MOZ_DEBUG"]: - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" - DEFINES["NDEBUG"] = True - DEFINES["NVALGRIND"] = True - -if CONFIG["MOZ_DEBUG"] == "1": - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" - DEFINES["_DEBUG"] = True - -if CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["__ARM_NEON__"] = "1" - -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" +DEFINES["HAVE_STRONG_GETAUXVAL"] = "0" +DEFINES["HAVE_WEAK_GETAUXVAL"] = "0" +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_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" - -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True - DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1" - DEFINES["HAVE_STRONG_GETAUXVAL"] = "1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["HAVE_WEAK_GETAUXVAL"] = "1" - 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["HAVE_STRONG_GETAUXVAL"] = "0" - DEFINES["HAVE_WEAK_GETAUXVAL"] = "0" - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - - DEFINES["HAVE_STRONG_GETAUXVAL"] = "1" - DEFINES["HAVE_WEAK_GETAUXVAL"] = "1" - DEFINES["USE_AURA"] = "1" - DEFINES["USE_GLIB"] = "1" - 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 - DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["HAVE_STRONG_GETAUXVAL"] = "0" - DEFINES["HAVE_WEAK_GETAUXVAL"] = "0" - DEFINES["USE_GLIB"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True - DEFINES["HAVE_STRONG_GETAUXVAL"] = "0" - DEFINES["HAVE_WEAK_GETAUXVAL"] = "0" - DEFINES["NOMINMAX"] = True - DEFINES["NTDDI_VERSION"] = "0x0A000000" - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True - DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" - DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True - DEFINES["__STD_C"] = True + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["HAVE_MM_PREFETCH"] = "0" DEFINES["__ARM_NEON__"] = "1" -if CONFIG["TARGET_CPU"] == "arm": - - CXXFLAGS += [ - "-mfpu=neon" - ] - - DEFINES["HAVE_MM_PREFETCH"] = "0" - if CONFIG["TARGET_CPU"] == "loongarch64": DEFINES["HAVE_MM_PREFETCH"] = "0" - DEFINES["_GNU_SOURCE"] = True if CONFIG["TARGET_CPU"] == "mips32": DEFINES["HAVE_MM_PREFETCH"] = "0" - DEFINES["_GNU_SOURCE"] = True if CONFIG["TARGET_CPU"] == "mips64": DEFINES["HAVE_MM_PREFETCH"] = "0" - DEFINES["_GNU_SOURCE"] = True 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": - DEFINES["HAVE_MM_PREFETCH"] = "1" - -if CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["HAVE_MM_PREFETCH"] = "1" - -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["HAVE_MM_PREFETCH"] = "1" -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": +if CONFIG["TARGET_CPU"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True + DEFINES["HAVE_MM_PREFETCH"] = "1" 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" +DEFINES["HAVE_STRONG_GETAUXVAL"] = "0" +DEFINES["HAVE_WEAK_GETAUXVAL"] = "0" +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_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" - -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True - DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1" - DEFINES["HAVE_STRONG_GETAUXVAL"] = "1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["HAVE_WEAK_GETAUXVAL"] = "1" - 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["HAVE_STRONG_GETAUXVAL"] = "0" - DEFINES["HAVE_WEAK_GETAUXVAL"] = "0" - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - - DEFINES["HAVE_STRONG_GETAUXVAL"] = "1" - DEFINES["HAVE_WEAK_GETAUXVAL"] = "1" - DEFINES["USE_AURA"] = "1" - DEFINES["USE_GLIB"] = "1" - 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 - DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["HAVE_STRONG_GETAUXVAL"] = "0" - DEFINES["HAVE_WEAK_GETAUXVAL"] = "0" - DEFINES["USE_GLIB"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True - DEFINES["HAVE_STRONG_GETAUXVAL"] = "0" - DEFINES["HAVE_WEAK_GETAUXVAL"] = "0" - DEFINES["NOMINMAX"] = True - DEFINES["NTDDI_VERSION"] = "0x0A000000" - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True - DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" - DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True - DEFINES["__STD_C"] = True + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["HAVE_MM_PREFETCH"] = "0" DEFINES["__ARM_NEON__"] = "1" -if CONFIG["TARGET_CPU"] == "arm": - - CXXFLAGS += [ - "-mfpu=neon" - ] - - DEFINES["HAVE_MM_PREFETCH"] = "0" - if CONFIG["TARGET_CPU"] == "loongarch64": DEFINES["HAVE_MM_PREFETCH"] = "0" - DEFINES["_GNU_SOURCE"] = True if CONFIG["TARGET_CPU"] == "mips32": DEFINES["HAVE_MM_PREFETCH"] = "0" - DEFINES["_GNU_SOURCE"] = True if CONFIG["TARGET_CPU"] == "mips64": DEFINES["HAVE_MM_PREFETCH"] = "0" - DEFINES["_GNU_SOURCE"] = True 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": - DEFINES["HAVE_MM_PREFETCH"] = "1" - -if CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["HAVE_MM_PREFETCH"] = "1" - -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["HAVE_MM_PREFETCH"] = "1" -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": +if CONFIG["TARGET_CPU"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True + DEFINES["HAVE_MM_PREFETCH"] = "1" 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() +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_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" - -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True - DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1" - DEFINES["HAVE_SYS_UIO_H"] = 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["__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["_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["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True - DEFINES["NOMINMAX"] = True - DEFINES["NTDDI_VERSION"] = "0x0A000000" - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True - DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" - DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True - DEFINES["__STD_C"] = True + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["__ARM_NEON__"] = "1" -if CONFIG["TARGET_CPU"] == "loongarch64": - - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["TARGET_CPU"] == "mips32": - - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["TARGET_CPU"] == "mips64": - - DEFINES["_GNU_SOURCE"] = 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("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" +DEFINES["HAVE_STRONG_GETAUXVAL"] = "0" +DEFINES["HAVE_WEAK_GETAUXVAL"] = "0" +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_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" - -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True - DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1" - DEFINES["HAVE_STRONG_GETAUXVAL"] = "1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["HAVE_WEAK_GETAUXVAL"] = "1" - 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["HAVE_STRONG_GETAUXVAL"] = "0" - DEFINES["HAVE_WEAK_GETAUXVAL"] = "0" - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - - DEFINES["HAVE_STRONG_GETAUXVAL"] = "1" - DEFINES["HAVE_WEAK_GETAUXVAL"] = "1" - DEFINES["USE_AURA"] = "1" - DEFINES["USE_GLIB"] = "1" - 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 - DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["HAVE_STRONG_GETAUXVAL"] = "0" - DEFINES["HAVE_WEAK_GETAUXVAL"] = "0" - DEFINES["USE_GLIB"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True - DEFINES["HAVE_STRONG_GETAUXVAL"] = "0" - DEFINES["HAVE_WEAK_GETAUXVAL"] = "0" - DEFINES["NOMINMAX"] = True - DEFINES["NTDDI_VERSION"] = "0x0A000000" - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True - DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" - DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True - DEFINES["__STD_C"] = True + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["HAVE_MM_PREFETCH"] = "0" DEFINES["__ARM_NEON__"] = "1" -if CONFIG["TARGET_CPU"] == "arm": - - CXXFLAGS += [ - "-mfpu=neon" - ] - - DEFINES["HAVE_MM_PREFETCH"] = "0" - if CONFIG["TARGET_CPU"] == "loongarch64": DEFINES["HAVE_MM_PREFETCH"] = "0" - DEFINES["_GNU_SOURCE"] = True if CONFIG["TARGET_CPU"] == "mips32": DEFINES["HAVE_MM_PREFETCH"] = "0" - DEFINES["_GNU_SOURCE"] = True if CONFIG["TARGET_CPU"] == "mips64": DEFINES["HAVE_MM_PREFETCH"] = "0" - DEFINES["_GNU_SOURCE"] = True 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": - DEFINES["HAVE_MM_PREFETCH"] = "1" - -if CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["HAVE_MM_PREFETCH"] = "1" - -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["HAVE_MM_PREFETCH"] = "1" -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": +if CONFIG["TARGET_CPU"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True + DEFINES["HAVE_MM_PREFETCH"] = "1" 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" 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["_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" - -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": -@@ -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" -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": -@@ -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 -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("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" 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["_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" - -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": +@@ -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": -@@ -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 -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("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 -DEFINES["USE_AURA"] = "1" DEFINES["USE_GLIB"] = "1" DEFINES["USE_OZONE"] = "1" -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 DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" 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" -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"] == "mips32": 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" 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["_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" - -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": -@@ -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" -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": -@@ -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 -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("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() +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_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" - -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True - DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1" - DEFINES["HAVE_SYS_UIO_H"] = 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["__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["_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["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True - DEFINES["NOMINMAX"] = True - DEFINES["NTDDI_VERSION"] = "0x0A000000" - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True - DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" - DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True - DEFINES["__STD_C"] = True + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["__ARM_NEON__"] = "1" -if CONFIG["TARGET_CPU"] == "loongarch64": - - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["TARGET_CPU"] == "mips32": - - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["TARGET_CPU"] == "mips64": - - DEFINES["_GNU_SOURCE"] = 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("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() +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_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" - -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True - DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1" - DEFINES["HAVE_SYS_UIO_H"] = 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["__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["_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["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True - DEFINES["NOMINMAX"] = True - DEFINES["NTDDI_VERSION"] = "0x0A000000" - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True - DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" - DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True - DEFINES["_USE_MATH_DEFINES"] = 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": DEFINES["__ARM_NEON__"] = "1" -if CONFIG["TARGET_CPU"] == "arm": - - CFLAGS += [ - "-mfpu=neon" - ] - if CONFIG["TARGET_CPU"] == "loongarch64": DEFINES["PFFFT_SIMD_DISABLE"] = True - DEFINES["_GNU_SOURCE"] = True if CONFIG["TARGET_CPU"] == "mips32": DEFINES["PFFFT_SIMD_DISABLE"] = True - DEFINES["_GNU_SOURCE"] = True if CONFIG["TARGET_CPU"] == "mips64": DEFINES["PFFFT_SIMD_DISABLE"] = True - DEFINES["_GNU_SOURCE"] = True 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 -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": - -- CFLAGS += [ -- "-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": -+if CONFIG["TARGET_CPU"] == "x86": - - CFLAGS += [ - "-msse2" - ] - -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": -- -- DEFINES["_GNU_SOURCE"] = True -- - Library("pffft_gn") -diff --git third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build -index fc239a9d7eae..541de9c16824 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 @@ - COMPILE_FLAGS["OS_INCLUDES"] = [] - AllowCompilerWarnings() - -+DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_OZONE"] = "1" -+DEFINES["_FILE_OFFSET_BITS"] = "64" -+DEFINES["_LARGEFILE64_SOURCE"] = True -+DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["_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"]: - 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["_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["__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["_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["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True -- DEFINES["NOMINMAX"] = True -- DEFINES["NTDDI_VERSION"] = "0x0A000000" -- DEFINES["PSAPI_VERSION"] = "2" -- DEFINES["UNICODE"] = True -- DEFINES["USE_AURA"] = "1" -- DEFINES["WIN32"] = True -- DEFINES["WIN32_LEAN_AND_MEAN"] = True -- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" -- DEFINES["WINVER"] = "0x0A00" -- DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True -- DEFINES["_CRT_RAND_S"] = True -- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True -- DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True -- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True -- DEFINES["_SECURE_ATL"] = True -- DEFINES["_UNICODE"] = True -- DEFINES["_WIN32_WINNT"] = "0x0A00" -- DEFINES["_WINDOWS"] = True -- DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True -- DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True - - if CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["__ARM_NEON__"] = "1" - --if CONFIG["TARGET_CPU"] == "arm": -- -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- --if CONFIG["TARGET_CPU"] == "loongarch64": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["TARGET_CPU"] == "mips32": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["TARGET_CPU"] == "mips64": -- -- DEFINES["_GNU_SOURCE"] = 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["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 -- --if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": -- -- DEFINES["_GNU_SOURCE"] = True -- - Library("rnn_vad_gn") -diff --git third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build -index 3fdd6f82a882..d8565e99f4fc 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" - 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" - -@@ -54,115 +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 -- 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 += [ -- "GLESv2", -- "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": - -@@ -170,82 +75,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("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 ---- 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" - 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["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 += [ +- CFLAGS += [ - "-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 += [ ++if CONFIG["TARGET_CPU"] == "x86": + + CFLAGS += [ "-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("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 ---- third_party/libwebrtc/video/config/streams_config_gn/moz.build -+++ third_party/libwebrtc/video/config/streams_config_gn/moz.build -@@ -9,16 +9,29 @@ +- + 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 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,6 +9,14 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] AllowCompilerWarnings() -+CXXFLAGS += [ -+ "-std=gnu++20" -+] ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["_FILE_OFFSET_BITS"] = "64" ++DEFINES["_LARGEFILE64_SOURCE"] = True ++DEFINES["_LARGEFILE_SOURCE"] = True ++DEFINES["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + FINAL_LIBRARY = "xul" + + +@@ -34,136 +42,16 @@ 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["_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["__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["_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["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["TARGET_CPU"] == "aarch64": + + DEFINES["__ARM_NEON__"] = "1" + +-if CONFIG["TARGET_CPU"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +-if CONFIG["TARGET_CPU"] == "loongarch64": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["TARGET_CPU"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["TARGET_CPU"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = 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["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 +- +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": +- +- DEFINES["_GNU_SOURCE"] = True +- + Library("rnn_vad_gn") +diff --git third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build +index 63fce4361b2b..dad5ed7fa01c 100644 +--- third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build ++++ third_party/libwebrtc/video/adaptation/video_adaptation_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["_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"]: +@@ -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 - 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 += [ - "GLESv2", - "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": -@@ -163,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -149,82 +71,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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 74145a92544d..22716e70e484 100644 +--- third_party/libwebrtc/video/config/encoder_config_gn/moz.build ++++ third_party/libwebrtc/video/config/encoder_config_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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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" + 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 8bce9bd5ba2a..e266ecab0cd5 100644 +--- third_party/libwebrtc/video/config/streams_config_gn/moz.build ++++ third_party/libwebrtc/video/config/streams_config_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["_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"]: +@@ -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 - 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 += [ +- "GLESv2", - "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": +@@ -142,82 +64,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" -- ] -- + 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" - ] - +- 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("frame_instrumentation_evaluation_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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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 += [ -- "GLESv2", - "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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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 += [ +- "GLESv2", - "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": +@@ -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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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,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 - 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": -@@ -154,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" -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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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": +@@ -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 - -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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 8d00bc66d4d7..37dd43f219d7 100644 +--- third_party/libwebrtc/video/decode_synchronizer_gn/moz.build ++++ third_party/libwebrtc/video/decode_synchronizer_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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 ---- third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build -+++ third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build + 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 0764c59c2ae1..76d308fbc122 100644 +--- third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build ++++ third_party/libwebrtc/video/frame_cadence_adapter_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["_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"]: +@@ -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 - - 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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -137,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 - -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": -@@ -165,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 - -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": - -- 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("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 ---- 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() ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -+CXXFLAGS += [ -+ "-std=gnu++20" -+] -+ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + 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 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" 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["_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"]: +@@ -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 - 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": +@@ -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 - -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 -- +@@ -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 - -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("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 ---- 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" +- + 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 dff6817185a6..a6391ed1d6d9 100644 +--- third_party/libwebrtc/video/frame_decode_timing_gn/moz.build ++++ third_party/libwebrtc/video/frame_decode_timing_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["_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 - 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 += [ -- "GLESv2", - "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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 227df191f979..60e92d4b43b8 100644 +--- third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build ++++ third_party/libwebrtc/video/frame_dumping_decoder_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["_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 - 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 += [ - "GLESv2", - "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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 8d0c58f78dc2..e80fc74c8dfc 100644 +--- third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build ++++ third_party/libwebrtc/video/frame_dumping_encoder_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["_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 - 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 += [ +- "GLESv2", - "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": +@@ -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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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": +@@ -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["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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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,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 - 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": -- -- CXXFLAGS += [ -- "-std=gnu++20" +- 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": - -- 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": -@@ -150,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" -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("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 ---- 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" + 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 a18e7c809be4..15326cffbbdd 100644 +--- third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build ++++ third_party/libwebrtc/video/unique_timestamp_counter_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["_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"]: +@@ -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 - 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 += [ -- "GLESv2", -- "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": -@@ -181,82 +86,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -129,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 += [ "-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("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 ---- 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" + Library("unique_timestamp_counter_gn") +diff --git third_party/libwebrtc/video/video_gn/moz.build third_party/libwebrtc/video/video_gn/moz.build +index bf9570a50f61..852d85724b5a 100644 +--- third_party/libwebrtc/video/video_gn/moz.build ++++ third_party/libwebrtc/video/video_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["_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"]: +@@ -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 - 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 += [ +- "GLESv2", - "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": +@@ -160,82 +82,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" -- ] -- + 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" - ] - +- 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("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 ---- 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" + 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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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["_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 - 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 += [ -- "GLESv2", - "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": -@@ -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" -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" - ] - --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("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 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 +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_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,94 +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 += [ +- "GLESv2", +- "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": + +@@ -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["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 -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("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 +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["_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 - 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 += [ - "GLESv2", - "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": -@@ -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" -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" -- ] -- + 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" - ] - +- 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("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" 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["_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" - -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["_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 - - OS_LIBS += [ - "crypt32", - "iphlpapi", - "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True 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" -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": -@@ -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 -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("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" 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["_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" - -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 += [ - "GLESv2", - "log" - ] - -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - - LOCAL_INCLUDES += [ - "/third_party/libwebrtc/sdk/objc/", - "/third_party/libwebrtc/sdk/objc/base/" - ] - -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 - - OS_LIBS += [ - "X11", - "Xcomposite", - "Xdamage", - "Xext", - "Xfixes", - "Xrandr", - "Xrender" - ] - -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", - "d3d11", - "dwmapi", - "dxgi", - "iphlpapi", - "ole32", - "oleaut32", - "secur32", - "shcore", - "strmiids", - "user32", - "winmm" - ] + DEFINES["_DEBUG"] = True 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" -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": -@@ -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 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": 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" ] -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("webrtc_gn") diff --git a/mail/thunderbird/files/patch-python_sites_mach.txt b/mail/thunderbird/files/patch-python_sites_mach.txt index 706f285b0731..cc59e963c2de 100644 --- a/mail/thunderbird/files/patch-python_sites_mach.txt +++ b/mail/thunderbird/files/patch-python_sites_mach.txt @@ -1,18 +1,20 @@ -commit 10ee367cbe7ff5a19acfcfe3bfb75a49671e4132 +commit 9978044775efea5d7c16949bc4755ce4681fb2f8 Author: Christoph Moench-Tegeder bump psutil (same as ports) 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