diff --git a/www/tor-browser/Makefile b/www/tor-browser/Makefile index 3ed152b2d..b2af395fb 100644 --- a/www/tor-browser/Makefile +++ b/www/tor-browser/Makefile @@ -1,11 +1,14 @@ PORTNAME= tor-browser -DISTVERSION= 12.0.6 -PORTREVISION= 6 +DISTVERSION= 13.0.1 CATEGORIES= www net security wayland -MASTER_SITES= TOR -MASTER_SITE_SUBDIR=torbrowser/${DISTVERSION} -DISTNAME= src-firefox-tor-browser-102.11.0esr-${DISTVERSION:R}-1-build1 - +MASTER_SITES= TOR \ + https://build-sources.tbb.torproject.org/:source1 \ + LOCAL/jsm:source2 +MASTER_SITE_SUBDIR= torbrowser/${DISTVERSION} +DISTNAME= src-firefox-tor-browser-115.4.0esr-13.0-1-build2 +DISTFILES= ${DISTNAME}.tar.xz \ + manual_112141.zip:source1 \ + firefox-tor-browser-13.0.1-build2-firefox-1l0n-out.tar:source2 MAINTAINER= freebsd@sysctl.cz COMMENT= Tor Browser for FreeBSD WWW= https://www.torproject.org/ @@ -25,11 +28,16 @@ BUILD_DEPENDS= nspr>=4.32:devel/nspr \ nasm:devel/nasm \ yasm:devel/yasm \ zip:archivers/zip +USE_GITLAB=nodefault +GL_SITE= https://gitlab.torproject.org/ +GL_ACCOUNT= tpo +GL_PROJECT= translation:basebrowser translation:torbrowser +GL_TAGNAME= 3faf7dcd545109f7bbd8a6374838e139ca422d6c:basebrowser 51bc08246d73990d461f747fb3c8cc7b6f66c1f4:torbrowser RUN_DEPENDS= tor:security/tor \ obfs4proxy:security/obfs4proxy-tor USES= compiler:c++11-lib libtool \ - perl5 pkgconfig python shebangfix localbase:ldflags tar:xz + perl5 pkgconfig python shebangfix localbase:ldflags tar:xz python:3 USE_GECKO= gecko SSP_UNSAFE= yes @@ -38,17 +46,19 @@ SUB_FILES= torrc-defaults tor-browser.desktop BUNDLE_LIBS= yes USE_MOZILLA= -sqlite +MOZILLA_VER=115.4.0 CFLAGS_powerpc64le= -DSQLITE_BYTEORDER=1234 CONFIGURE_ENV+= BINDGEN_CFLAGS="-I${LOCALBASE}/include" \ - MOZ_BRANDING_DIRECTORY="browser/branding/official" - + MOZ_CHROME_MULTILOCALE="ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN zh-TW en-US" +MAKE_ENV+= AB_CD="multi" \ + LOCALES="ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN zh-TW en-US" MOZ_EXPORT+= MOZ_TELEMETRY_REPORTING="" \ MOZILLA_OFFICIAL="1" \ MOZ_OFFICIAL_BRANDING="1" \ MOZ_APP_DISPLAYNAME="Tor Browser" \ - MOZ_APP_NAME="tor-browser" - -MOZ_OPTIONS= --with-tor-browser-version=${DISTVERSION}-1 \ + MOZ_APP_NAME="tor-browser" \ + MOZ_CHROME_MULTILOCALE="ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN zh-TW en-US" +MOZ_OPTIONS= --with-base-browser-version=${DISTVERSION} \ --enable-official-branding \ --enable-optimize \ --enable-bundled-fonts \ @@ -60,12 +70,11 @@ MOZ_OPTIONS= --with-tor-browser-version=${DISTVERSION}-1 \ --enable-proxy-bypass-protection \ --disable-system-policies \ --disable-backgroundtasks \ - --enable-base-browser \ - --enable-verify-mar \ - --with-distribution-id=org.torproject + --with-distribution-id=org.torproject \ + --with-branding=browser/branding/tb-release WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} - +SHEBANG_FILES+= mach .include "${.CURDIR}/../../www/firefox/Makefile.options" .include @@ -83,11 +92,29 @@ MOZ_OPTIONS+= --with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot .endif post-patch: @${REINPLACE_CMD} 's|LOCALBASE|${LOCALBASE}|g' "${WRKSRC}/browser/app/profile/000-tor-browser.js" + ${MKDIR} ${WRKSRC}/tmp-manual + unzip -d ${WRKSRC}/tmp-manual ${DISTDIR}/manual_112141.zip + ${MKDIR} ${WRKSRC}/tmp-l10n-central + tar -C ${WRKSRC}/tmp-l10n-central -xf ${DISTDIR}/firefox-tor-browser-13.0.1-build2-firefox-1l0n-out.tar pre-configure: - (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf2.13) - (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf2.13) @${REINPLACE_CMD} 's|export MOZ_GOOGLE_.*||g' ${WRKSRC}/.mozconfig - @${REINPLACE_CMD} 's|ac_add_options --enable-update-channel=release||g' ${WRKSRC}/.mozconfig + ${PYTHON_CMD} ${FILESDIR}/packagemanual.py ${WRKSRC}/tmp-manual/public ${WRKSRC}/browser/base/content/manual +post-build: + ${MKDIR} -p ${WRKSRC}/../.mozbuild/l10n-central + find ${WRKSRC}/tmp-l10n-central -name "*.tar.xz" -exec tar -C ${WRKSRC}/../.mozbuild/l10n-central -xvf {} \; + cd ${WRKSRC}/../.build/ && MOZBUILD_STATE_PATH=${WRKSRC}/../.mozbuild MOZ_AUTOMATION="1" ${WRKSRC}/mach package-multi-locale --locales ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN zh-TW +.for i in ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN zh-TW + ${CP} ${WRKDIR}/translation-3faf7dcd545109f7bbd8a6374838e139ca422d6c/${i}/base-browser.ftl ${WRKDIR}/.build/dist/bin/browser/localization/${i}/browser/base-browser.ftl + ${CP} ${WRKDIR}/translation-3faf7dcd545109f7bbd8a6374838e139ca422d6c/${i}/newIdentity.properties ${WRKDIR}/.build/dist/bin/browser/chrome/${i}/locale/browser/newIdentity.properties + ${CP} ${WRKDIR}/translation-3faf7dcd545109f7bbd8a6374838e139ca422d6c/${i}/securityLevel.properties ${WRKDIR}/.build/dist/bin/browser/chrome/${i}/locale/browser/securityLevel.properties + ${MKDIR} ${WRKDIR}/.build/dist/bin/chrome/torbutton/locale/${i}/browser + test -f ${WRKDIR}/translation-51bc08246d73990d461f747fb3c8cc7b6f66c1f4/${i}/tor-browser.ftl && ${CP} ${WRKDIR}/translation-51bc08246d73990d461f747fb3c8cc7b6f66c1f4/${i}/tor-browser.ftl ${WRKDIR}/.build/dist/bin/browser/localization/${i}/browser/tor-browser.ftl + ${CP} ${WRKDIR}/translation-51bc08246d73990d461f747fb3c8cc7b6f66c1f4/${i}/cryptoSafetyPrompt.properties ${WRKDIR}/.build/dist/bin/browser/chrome/${i}/locale/browser/cryptoSafetyPrompt.properties +.for j in brand.dtd aboutDialog.dtd aboutTBUpdate.dtd torbutton.dtd onboarding.properties brand.properties torlauncher.properties branding/brand.ftl rulesets.properties settings.properties torConnect.properties onionLocation.properties aboutTor.dtd torbutton.properties browserOnboarding.properties + ${MKDIR} ${WRKDIR}/.build/dist/bin/chrome/torbutton/locale/${i}/branding + ${CP} ${WRKDIR}/translation-51bc08246d73990d461f747fb3c8cc7b6f66c1f4/${i}/${j} ${WRKDIR}/.build/dist/bin/chrome/torbutton/locale/${i}/${j} +.endfor +.endfor post-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKDIR}/torrc-defaults ${STAGEDIR}${DATADIR}/torrc-defaults diff --git a/www/tor-browser/distinfo b/www/tor-browser/distinfo index c8c74a339..dc0046261 100644 --- a/www/tor-browser/distinfo +++ b/www/tor-browser/distinfo @@ -1,3 +1,11 @@ -TIMESTAMP = 1684065683 -SHA256 (src-firefox-tor-browser-102.11.0esr-12.0-1-build1.tar.xz) = 9b64d00e9bb5ad63f005e8f950800ab3a12f75f214c55f900d88df26bce1ba5d -SIZE (src-firefox-tor-browser-102.11.0esr-12.0-1-build1.tar.xz) = 511957244 +TIMESTAMP = 1699195800 +SHA256 (src-firefox-tor-browser-115.4.0esr-13.0-1-build2.tar.xz) = 7b8d90c9d5ac0cc527da5e8170893e6c5af0f7ad924cfcde9a7ebfbdf3f2e486 +SIZE (src-firefox-tor-browser-115.4.0esr-13.0-1-build2.tar.xz) = 544811340 +SHA256 (manual_112141.zip) = f767bc5f655f1263623b7af588cfb045d3e41ee019dc7ecd713decc5c1a0ea9b +SIZE (manual_112141.zip) = 26293073 +SHA256 (firefox-tor-browser-13.0.1-build2-firefox-1l0n-out.tar) = bbd290cd134e3a114241077ba82582617ab6c5117ff2226381943c504bd09775 +SIZE (firefox-tor-browser-13.0.1-build2-firefox-1l0n-out.tar) = 18848768 +SHA256 (tpo-translation-3faf7dcd545109f7bbd8a6374838e139ca422d6c_GL0.tar.gz) = e6fdc79f74d2c438a44e5ffb6404e3d64bab879cf146e88a170ccdcef3596d9b +SIZE (tpo-translation-3faf7dcd545109f7bbd8a6374838e139ca422d6c_GL0.tar.gz) = 108057 +SHA256 (tpo-translation-51bc08246d73990d461f747fb3c8cc7b6f66c1f4_GL0.tar.gz) = a57dd8210d347ca69f5731cd768862673d692c0a5a3364f411cc5fa1fb88c98e +SIZE (tpo-translation-51bc08246d73990d461f747fb3c8cc7b6f66c1f4_GL0.tar.gz) = 1059523 diff --git a/www/tor-browser/files/packagemanual.py b/www/tor-browser/files/packagemanual.py new file mode 100644 index 000000000..7af51046a --- /dev/null +++ b/www/tor-browser/files/packagemanual.py @@ -0,0 +1,69 @@ +#!/usr/bin/env python3 +from pathlib import Path +import re +import sys +import shutil + + +PAGE_NAME = 'offline-docs' +STATIC_PATH = 'chrome://browser/content/manual/static' + +if len(sys.argv) < 3: + print(f'Usage: {sys.argv[0]} lektor-out-directory target-directory') + sys.exit(1) + +source = Path(sys.argv[1]) +target = Path(sys.argv[2]) +if not target.exists(): + target.mkdir(exist_ok=True) + +static_re = re.compile('"(?:../)*static/([^"]+)"') +link_re = re.compile('href="../([^"]+)"') + + +def clean_urls(match): + m = re.match(r'(?:../)?([^/#]+)[/]?[#]?(.*)', match.group(1)) + slug = m.group(1) + if m.group(2): + anchor = '_' + m.group(2) + else: + anchor = '' + return f'href="#{slug}{anchor}"' + + +remove_images = [] +for p in (source / 'static/images').glob('**/*'): + if p.is_file(): + rel = p.relative_to(source) + remove_images.append(rel) + +htmls = source.rglob(f'{PAGE_NAME}/index.html') +for page in htmls: + with page.open(encoding='utf8') as f: + contents = f.read() + + remove_images = list(filter( + lambda im: contents.find(str(im)) == -1, remove_images)) + + contents = static_re.sub(f'"{STATIC_PATH}/\\1"', contents) + contents = link_re.sub(clean_urls, contents) + + rel = page.relative_to(source) + dest_name = str(list(rel.parents)[-2].name) + if dest_name == PAGE_NAME: + dest_name = 'en' + dest_name += '.html' + with (target / dest_name).open('w', encoding='utf8') as f: + f.write(contents) + + +def ignore_images(path, names): + return [ + n + for n in names + if Path(path, n).relative_to(source) in remove_images + ] + + +shutil.rmtree(target / 'static', ignore_errors=True) +shutil.copytree(source / 'static', target / 'static', ignore=ignore_images) diff --git a/www/tor-browser/files/patch-addon-search b/www/tor-browser/files/patch-addon-search index f405eab2a..b6dbf7924 100644 --- a/www/tor-browser/files/patch-addon-search +++ b/www/tor-browser/files/patch-addon-search @@ -2,7 +2,7 @@ https://github.com/mozilla/addons/issues/708 https://github.com/mozilla/addons-frontend/issues/4610 diff --git browser/app/profile/firefox.js browser/app/profile/firefox.js -index af08811..77a3b18 100644 +index 621900f90fc1..401ef9074bd0 100644 --- browser/app/profile/firefox.js +++ browser/app/profile/firefox.js @@ -38,7 +38,7 @@ pref("extensions.postDownloadThirdPartyPrompt", true); @@ -14,7 +14,7 @@ index af08811..77a3b18 100644 pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/firefox/"); pref("extensions.getAddons.langpacks.url", "https://services.addons.mozilla.org/api/v4/addons/language-tools/?app=firefox&type=language&appversion=%VERSION%"); pref("extensions.getAddons.discovery.api_url", "https://services.addons.mozilla.org/api/v4/discovery/?lang=%LOCALE%&edition=%DISTRIBUTION%"); -@@ -193,8 +193,8 @@ pref("app.update.langpack.enabled", true); +@@ -204,8 +204,8 @@ pref("app.update.langpack.enabled", true); // .. etc .. // pref("extensions.update.enabled", true); @@ -25,24 +25,24 @@ index af08811..77a3b18 100644 pref("extensions.update.interval", 86400); // Check for updates to Extensions and // Themes every day -diff --git toolkit/mozapps/extensions/internal/AddonRepository.jsm toolkit/mozapps/extensions/internal/AddonRepository.jsm -index 661c902..a41b32f 100644 ---- toolkit/mozapps/extensions/internal/AddonRepository.jsm -+++ toolkit/mozapps/extensions/internal/AddonRepository.jsm -@@ -592,7 +592,7 @@ var AddonRepository = { +diff --git toolkit/mozapps/extensions/internal/AddonRepository.sys.mjs toolkit/mozapps/extensions/internal/AddonRepository.sys.mjs +index f906f244b658..7bb2eb6697c6 100644 +--- toolkit/mozapps/extensions/internal/AddonRepository.sys.mjs ++++ toolkit/mozapps/extensions/internal/AddonRepository.sys.mjs +@@ -596,7 +596,7 @@ export var AddonRepository = { addon.version = String(aEntry.current_version.version); if (Array.isArray(aEntry.current_version.files)) { for (let file of aEntry.current_version.files) { -- if (file.platform == "all" || file.platform == PLATFORM) { -+ if (file.platform == "all" || file.platform == "linux" || file.platform == PLATFORM) { +- if (file.platform == "all" || file.platform == lazy.PLATFORM) { ++ if (file.platform == "all" || file.platform == "linux" || file.platform == lazy.PLATFORM) { if (file.url) { - addon.sourceURI = NetUtil.newURI(file.url); + addon.sourceURI = lazy.NetUtil.newURI(file.url); } diff --git toolkit/mozapps/extensions/internal/XPIDatabase.jsm toolkit/mozapps/extensions/internal/XPIDatabase.jsm -index f8c99c7..c6ba8a1 100644 +index 03186dad43a4..4053fc6f2702 100644 --- toolkit/mozapps/extensions/internal/XPIDatabase.jsm +++ toolkit/mozapps/extensions/internal/XPIDatabase.jsm -@@ -520,7 +520,7 @@ class AddonInternal { +@@ -634,7 +634,7 @@ class AddonInternal { // Something is causing errors in here try { for (let platform of this.targetPlatforms) { diff --git a/www/tor-browser/files/patch-browser-app-nsBrowserApp.cpp b/www/tor-browser/files/patch-browser-app-nsBrowserApp.cpp index 3b9097714..68cb778b9 100644 --- a/www/tor-browser/files/patch-browser-app-nsBrowserApp.cpp +++ b/www/tor-browser/files/patch-browser-app-nsBrowserApp.cpp @@ -1,14 +1,12 @@ -diff --git browser/app/nsBrowserApp.cpp browser/app/nsBrowserApp.cpp -index 87c2e16..a41f1d9 100644 ---- browser/app/nsBrowserApp.cpp +--- browser/app/nsBrowserApp.cpp.orig 2016-09-19 16:19:28 UTC +++ browser/app/nsBrowserApp.cpp -@@ -337,6 +337,9 @@ int main(int argc, char* argv[], char* envp[]) { - } - #endif +@@ -324,6 +324,9 @@ int main(int argc, char* argv[], char* e + { + mozilla::TimeStamp start = mozilla::TimeStamp::Now(); + setenv("MOZ_GMP_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); + setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); + #ifdef HAS_DLL_BLOCKLIST - DllBlocklist_Initialize(gBlocklistInitFlags); - #endif + DllBlocklist_Initialize(); + diff --git a/www/tor-browser/files/patch-browser-base-jar.mn b/www/tor-browser/files/patch-browser-base-jar.mn new file mode 100644 index 000000000..0dbfd0224 --- /dev/null +++ b/www/tor-browser/files/patch-browser-base-jar.mn @@ -0,0 +1,227 @@ +--- browser/base/jar.mn.orig 2023-10-21 13:09:52.025195000 +0000 ++++ browser/base/jar.mn 2023-10-21 13:10:04.930188000 +0000 +@@ -112,3 +112,224 @@ + * content/browser/default-bookmarks.html (content/default-bookmarks.html) + + content/browser/languageNotification.js (content/languageNotification.js) ++ content/browser/manual/ar.html (content/manual/ar.html) ++ content/browser/manual/bn.html (content/manual/bn.html) ++ content/browser/manual/ca.html (content/manual/ca.html) ++ content/browser/manual/de.html (content/manual/de.html) ++ content/browser/manual/el.html (content/manual/el.html) ++ content/browser/manual/en.html (content/manual/en.html) ++ content/browser/manual/es.html (content/manual/es.html) ++ content/browser/manual/fa.html (content/manual/fa.html) ++ content/browser/manual/fi.html (content/manual/fi.html) ++ content/browser/manual/fr.html (content/manual/fr.html) ++ content/browser/manual/ga.html (content/manual/ga.html) ++ content/browser/manual/he.html (content/manual/he.html) ++ content/browser/manual/hu.html (content/manual/hu.html) ++ content/browser/manual/id.html (content/manual/id.html) ++ content/browser/manual/is.html (content/manual/is.html) ++ content/browser/manual/it.html (content/manual/it.html) ++ content/browser/manual/ka.html (content/manual/ka.html) ++ content/browser/manual/km.html (content/manual/km.html) ++ content/browser/manual/ko.html (content/manual/ko.html) ++ content/browser/manual/lt.html (content/manual/lt.html) ++ content/browser/manual/mk.html (content/manual/mk.html) ++ content/browser/manual/my.html (content/manual/my.html) ++ content/browser/manual/pl.html (content/manual/pl.html) ++ content/browser/manual/pt-BR.html (content/manual/pt-BR.html) ++ content/browser/manual/pt-PT.html (content/manual/pt-PT.html) ++ content/browser/manual/ro.html (content/manual/ro.html) ++ content/browser/manual/ru.html (content/manual/ru.html) ++ content/browser/manual/sq.html (content/manual/sq.html) ++ content/browser/manual/static/collapse.min.js (content/manual/static/collapse.min.js) ++ content/browser/manual/static/css/bootstrap-grid.css (content/manual/static/css/bootstrap-grid.css) ++ content/browser/manual/static/css/bootstrap-reboot.css (content/manual/static/css/bootstrap-reboot.css) ++ content/browser/manual/static/css/bootstrap.css (content/manual/static/css/bootstrap.css) ++ content/browser/manual/static/fonts/Corben/Corben-Bold.ttf (content/manual/static/fonts/Corben/Corben-Bold.ttf) ++ content/browser/manual/static/fonts/Corben/Corben.ttf (content/manual/static/fonts/Corben/Corben.ttf) ++ content/browser/manual/static/fonts/Hanuman/Hanuman-Black.ttf (content/manual/static/fonts/Hanuman/Hanuman-Black.ttf) ++ content/browser/manual/static/fonts/Hanuman/Hanuman-Bold.ttf (content/manual/static/fonts/Hanuman/Hanuman-Bold.ttf) ++ content/browser/manual/static/fonts/Hanuman/Hanuman-Light.ttf (content/manual/static/fonts/Hanuman/Hanuman-Light.ttf) ++ content/browser/manual/static/fonts/Hanuman/Hanuman-Regular.ttf (content/manual/static/fonts/Hanuman/Hanuman-Regular.ttf) ++ content/browser/manual/static/fonts/Hanuman/Hanuman-Thin.ttf (content/manual/static/fonts/Hanuman/Hanuman-Thin.ttf) ++ content/browser/manual/static/fonts/Hanuman/OFL.txt (content/manual/static/fonts/Hanuman/OFL.txt) ++ content/browser/manual/static/fonts/Kanit/kanit.woff2 (content/manual/static/fonts/Kanit/kanit.woff2) ++ content/browser/manual/static/fonts/LeagueGothic/LeagueGothic-Italic.otf (content/manual/static/fonts/LeagueGothic/LeagueGothic-Italic.otf) ++ content/browser/manual/static/fonts/LeagueGothic/League_Gothic_Regular.woff (content/manual/static/fonts/LeagueGothic/League_Gothic_Regular.woff) ++ content/browser/manual/static/fonts/SourceCodePro/OFL.txt (content/manual/static/fonts/SourceCodePro/OFL.txt) ++ content/browser/manual/static/fonts/SourceCodePro/SourceCodePro-Black.ttf (content/manual/static/fonts/SourceCodePro/SourceCodePro-Black.ttf) ++ content/browser/manual/static/fonts/SourceCodePro/SourceCodePro-Bold.ttf (content/manual/static/fonts/SourceCodePro/SourceCodePro-Bold.ttf) ++ content/browser/manual/static/fonts/SourceCodePro/SourceCodePro-ExtraLight.ttf (content/manual/static/fonts/SourceCodePro/SourceCodePro-ExtraLight.ttf) ++ content/browser/manual/static/fonts/SourceCodePro/SourceCodePro-Light.ttf (content/manual/static/fonts/SourceCodePro/SourceCodePro-Light.ttf) ++ content/browser/manual/static/fonts/SourceCodePro/SourceCodePro-Medium.ttf (content/manual/static/fonts/SourceCodePro/SourceCodePro-Medium.ttf) ++ content/browser/manual/static/fonts/SourceCodePro/SourceCodePro-Regular.ttf (content/manual/static/fonts/SourceCodePro/SourceCodePro-Regular.ttf) ++ content/browser/manual/static/fonts/SourceCodePro/SourceCodePro-Semibold.ttf (content/manual/static/fonts/SourceCodePro/SourceCodePro-Semibold.ttf) ++ content/browser/manual/static/fonts/SourceSansPro/OFL.txt (content/manual/static/fonts/SourceSansPro/OFL.txt) ++ content/browser/manual/static/fonts/SourceSansPro/SourceSansPro-Black.ttf (content/manual/static/fonts/SourceSansPro/SourceSansPro-Black.ttf) ++ content/browser/manual/static/fonts/SourceSansPro/SourceSansPro-BlackItalic.ttf (content/manual/static/fonts/SourceSansPro/SourceSansPro-BlackItalic.ttf) ++ content/browser/manual/static/fonts/SourceSansPro/SourceSansPro-Bold.ttf (content/manual/static/fonts/SourceSansPro/SourceSansPro-Bold.ttf) ++ content/browser/manual/static/fonts/SourceSansPro/SourceSansPro-BoldItalic.ttf (content/manual/static/fonts/SourceSansPro/SourceSansPro-BoldItalic.ttf) ++ content/browser/manual/static/fonts/SourceSansPro/SourceSansPro-ExtraLight.ttf (content/manual/static/fonts/SourceSansPro/SourceSansPro-ExtraLight.ttf) ++ content/browser/manual/static/fonts/SourceSansPro/SourceSansPro-ExtraLightItalic.ttf (content/manual/static/fonts/SourceSansPro/SourceSansPro-ExtraLightItalic.ttf) ++ content/browser/manual/static/fonts/SourceSansPro/SourceSansPro-Italic.ttf (content/manual/static/fonts/SourceSansPro/SourceSansPro-Italic.ttf) ++ content/browser/manual/static/fonts/SourceSansPro/SourceSansPro-Light.ttf (content/manual/static/fonts/SourceSansPro/SourceSansPro-Light.ttf) ++ content/browser/manual/static/fonts/SourceSansPro/SourceSansPro-LightItalic.ttf (content/manual/static/fonts/SourceSansPro/SourceSansPro-LightItalic.ttf) ++ content/browser/manual/static/fonts/SourceSansPro/SourceSansPro-Regular.ttf (content/manual/static/fonts/SourceSansPro/SourceSansPro-Regular.ttf) ++ content/browser/manual/static/fonts/SourceSansPro/SourceSansPro-SemiBold.ttf (content/manual/static/fonts/SourceSansPro/SourceSansPro-SemiBold.ttf) ++ content/browser/manual/static/fonts/SourceSansPro/SourceSansPro-SemiBoldItalic.ttf (content/manual/static/fonts/SourceSansPro/SourceSansPro-SemiBoldItalic.ttf) ++ content/browser/manual/static/fonts/SourceSerifPro/OFL.txt (content/manual/static/fonts/SourceSerifPro/OFL.txt) ++ content/browser/manual/static/fonts/SourceSerifPro/SourceSerifPro-Bold.ttf (content/manual/static/fonts/SourceSerifPro/SourceSerifPro-Bold.ttf) ++ content/browser/manual/static/fonts/SourceSerifPro/SourceSerifPro-Regular.ttf (content/manual/static/fonts/SourceSerifPro/SourceSerifPro-Regular.ttf) ++ content/browser/manual/static/fonts/SourceSerifPro/SourceSerifPro-Semibold.ttf (content/manual/static/fonts/SourceSerifPro/SourceSerifPro-Semibold.ttf) ++ content/browser/manual/static/fonts/TorIcons/tor-icons.eot (content/manual/static/fonts/TorIcons/tor-icons.eot) ++ content/browser/manual/static/fonts/TorIcons/tor-icons.svg (content/manual/static/fonts/TorIcons/tor-icons.svg) ++ content/browser/manual/static/fonts/TorIcons/tor-icons.ttf (content/manual/static/fonts/TorIcons/tor-icons.ttf) ++ content/browser/manual/static/fonts/TorIcons/tor-icons.woff (content/manual/static/fonts/TorIcons/tor-icons.woff) ++ content/browser/manual/static/fonts/TorIcons/tor-icons.woff2 (content/manual/static/fonts/TorIcons/tor-icons.woff2) ++ content/browser/manual/static/fonts/WhiteonBlack/WhiteOnBlack.ttf (content/manual/static/fonts/WhiteonBlack/WhiteOnBlack.ttf) ++ content/browser/manual/static/fonts/fontawesome/LICENSE.txt (content/manual/static/fonts/fontawesome/LICENSE.txt) ++ content/browser/manual/static/fonts/fontawesome/css/all.css (content/manual/static/fonts/fontawesome/css/all.css) ++ content/browser/manual/static/fonts/fontawesome/css/all.min.css (content/manual/static/fonts/fontawesome/css/all.min.css) ++ content/browser/manual/static/fonts/fontawesome/css/brands.css (content/manual/static/fonts/fontawesome/css/brands.css) ++ content/browser/manual/static/fonts/fontawesome/css/brands.min.css (content/manual/static/fonts/fontawesome/css/brands.min.css) ++ content/browser/manual/static/fonts/fontawesome/css/fontawesome.css (content/manual/static/fonts/fontawesome/css/fontawesome.css) ++ content/browser/manual/static/fonts/fontawesome/css/fontawesome.min.css (content/manual/static/fonts/fontawesome/css/fontawesome.min.css) ++ content/browser/manual/static/fonts/fontawesome/css/regular.css (content/manual/static/fonts/fontawesome/css/regular.css) ++ content/browser/manual/static/fonts/fontawesome/css/regular.min.css (content/manual/static/fonts/fontawesome/css/regular.min.css) ++ content/browser/manual/static/fonts/fontawesome/css/solid.css (content/manual/static/fonts/fontawesome/css/solid.css) ++ content/browser/manual/static/fonts/fontawesome/css/solid.min.css (content/manual/static/fonts/fontawesome/css/solid.min.css) ++ content/browser/manual/static/fonts/fontawesome/css/svg-with-js.css (content/manual/static/fonts/fontawesome/css/svg-with-js.css) ++ content/browser/manual/static/fonts/fontawesome/css/svg-with-js.min.css (content/manual/static/fonts/fontawesome/css/svg-with-js.min.css) ++ content/browser/manual/static/fonts/fontawesome/css/v4-shims.css (content/manual/static/fonts/fontawesome/css/v4-shims.css) ++ content/browser/manual/static/fonts/fontawesome/css/v4-shims.min.css (content/manual/static/fonts/fontawesome/css/v4-shims.min.css) ++ content/browser/manual/static/fonts/fontawesome/png/dark/solid/arrow-down.png (content/manual/static/fonts/fontawesome/png/dark/solid/arrow-down.png) ++ content/browser/manual/static/fonts/fontawesome/png/dark/solid/language.png (content/manual/static/fonts/fontawesome/png/dark/solid/language.png) ++ content/browser/manual/static/fonts/fontawesome/png/primary/brands/facebook.png (content/manual/static/fonts/fontawesome/png/primary/brands/facebook.png) ++ content/browser/manual/static/fonts/fontawesome/png/primary/brands/instagram.png (content/manual/static/fonts/fontawesome/png/primary/brands/instagram.png) ++ content/browser/manual/static/fonts/fontawesome/png/primary/brands/linkedin.png (content/manual/static/fonts/fontawesome/png/primary/brands/linkedin.png) ++ content/browser/manual/static/fonts/fontawesome/png/primary/brands/mastodon.png (content/manual/static/fonts/fontawesome/png/primary/brands/mastodon.png) ++ content/browser/manual/static/fonts/fontawesome/png/primary/brands/telegram.png (content/manual/static/fonts/fontawesome/png/primary/brands/telegram.png) ++ content/browser/manual/static/fonts/fontawesome/png/primary/brands/twitter.png (content/manual/static/fonts/fontawesome/png/primary/brands/twitter.png) ++ content/browser/manual/static/fonts/fontawesome/png/primary/brands/youtube.png (content/manual/static/fonts/fontawesome/png/primary/brands/youtube.png) ++ content/browser/manual/static/fonts/fontawesome/png/primary/regular/file-alt.png (content/manual/static/fonts/fontawesome/png/primary/regular/file-alt.png) ++ content/browser/manual/static/fonts/fontawesome/png/primary/solid/arrow-down.png (content/manual/static/fonts/fontawesome/png/primary/solid/arrow-down.png) ++ content/browser/manual/static/fonts/fontawesome/png/primary/solid/arrow-right.png (content/manual/static/fonts/fontawesome/png/primary/solid/arrow-right.png) ++ content/browser/manual/static/fonts/fontawesome/png/primary/solid/comments.png (content/manual/static/fonts/fontawesome/png/primary/solid/comments.png) ++ content/browser/manual/static/fonts/fontawesome/png/primary/solid/cube.png (content/manual/static/fonts/fontawesome/png/primary/solid/cube.png) ++ content/browser/manual/static/fonts/fontawesome/png/primary/solid/flag.png (content/manual/static/fonts/fontawesome/png/primary/solid/flag.png) ++ content/browser/manual/static/fonts/fontawesome/png/primary/solid/folder-open.png (content/manual/static/fonts/fontawesome/png/primary/solid/folder-open.png) ++ content/browser/manual/static/fonts/fontawesome/png/primary/solid/hands-helping.png (content/manual/static/fonts/fontawesome/png/primary/solid/hands-helping.png) ++ content/browser/manual/static/fonts/fontawesome/png/primary/solid/key.png (content/manual/static/fonts/fontawesome/png/primary/solid/key.png) ++ content/browser/manual/static/fonts/fontawesome/png/primary/solid/language.png (content/manual/static/fonts/fontawesome/png/primary/solid/language.png) ++ content/browser/manual/static/fonts/fontawesome/png/primary/solid/life-ring.png (content/manual/static/fonts/fontawesome/png/primary/solid/life-ring.png) ++ content/browser/manual/static/fonts/fontawesome/png/primary/solid/lock.png (content/manual/static/fonts/fontawesome/png/primary/solid/lock.png) ++ content/browser/manual/static/fonts/fontawesome/png/primary/solid/magnifying-glass.png (content/manual/static/fonts/fontawesome/png/primary/solid/magnifying-glass.png) ++ content/browser/manual/static/fonts/fontawesome/png/primary/solid/paper-plane.png (content/manual/static/fonts/fontawesome/png/primary/solid/paper-plane.png) ++ content/browser/manual/static/fonts/fontawesome/png/primary/solid/signature.png (content/manual/static/fonts/fontawesome/png/primary/solid/signature.png) ++ content/browser/manual/static/fonts/fontawesome/png/primary/solid/spider.png (content/manual/static/fonts/fontawesome/png/primary/solid/spider.png) ++ content/browser/manual/static/fonts/fontawesome/png/primary/solid/table-tennis.png (content/manual/static/fonts/fontawesome/png/primary/solid/table-tennis.png) ++ content/browser/manual/static/fonts/fontawesome/png/white/brands/android.png (content/manual/static/fonts/fontawesome/png/white/brands/android.png) ++ content/browser/manual/static/fonts/fontawesome/png/white/brands/apple.png (content/manual/static/fonts/fontawesome/png/white/brands/apple.png) ++ content/browser/manual/static/fonts/fontawesome/png/white/brands/facebook.png (content/manual/static/fonts/fontawesome/png/white/brands/facebook.png) ++ content/browser/manual/static/fonts/fontawesome/png/white/brands/github.png (content/manual/static/fonts/fontawesome/png/white/brands/github.png) ++ content/browser/manual/static/fonts/fontawesome/png/white/brands/instagram.png (content/manual/static/fonts/fontawesome/png/white/brands/instagram.png) ++ content/browser/manual/static/fonts/fontawesome/png/white/brands/linkedin.png (content/manual/static/fonts/fontawesome/png/white/brands/linkedin.png) ++ content/browser/manual/static/fonts/fontawesome/png/white/brands/linux.png (content/manual/static/fonts/fontawesome/png/white/brands/linux.png) ++ content/browser/manual/static/fonts/fontawesome/png/white/brands/mastodon.png (content/manual/static/fonts/fontawesome/png/white/brands/mastodon.png) ++ content/browser/manual/static/fonts/fontawesome/png/white/brands/twitter.png (content/manual/static/fonts/fontawesome/png/white/brands/twitter.png) ++ content/browser/manual/static/fonts/fontawesome/png/white/brands/windows.png (content/manual/static/fonts/fontawesome/png/white/brands/windows.png) ++ content/browser/manual/static/fonts/fontawesome/png/white/solid/arrow-down.png (content/manual/static/fonts/fontawesome/png/white/solid/arrow-down.png) ++ content/browser/manual/static/fonts/fontawesome/png/white/solid/arrow-right.png (content/manual/static/fonts/fontawesome/png/white/solid/arrow-right.png) ++ content/browser/manual/static/fonts/fontawesome/webfonts/fa-brands-400.eot (content/manual/static/fonts/fontawesome/webfonts/fa-brands-400.eot) ++ content/browser/manual/static/fonts/fontawesome/webfonts/fa-brands-400.svg (content/manual/static/fonts/fontawesome/webfonts/fa-brands-400.svg) ++ content/browser/manual/static/fonts/fontawesome/webfonts/fa-brands-400.ttf (content/manual/static/fonts/fontawesome/webfonts/fa-brands-400.ttf) ++ content/browser/manual/static/fonts/fontawesome/webfonts/fa-brands-400.woff (content/manual/static/fonts/fontawesome/webfonts/fa-brands-400.woff) ++ content/browser/manual/static/fonts/fontawesome/webfonts/fa-brands-400.woff2 (content/manual/static/fonts/fontawesome/webfonts/fa-brands-400.woff2) ++ content/browser/manual/static/fonts/fontawesome/webfonts/fa-regular-400.eot (content/manual/static/fonts/fontawesome/webfonts/fa-regular-400.eot) ++ content/browser/manual/static/fonts/fontawesome/webfonts/fa-regular-400.svg (content/manual/static/fonts/fontawesome/webfonts/fa-regular-400.svg) ++ content/browser/manual/static/fonts/fontawesome/webfonts/fa-regular-400.ttf (content/manual/static/fonts/fontawesome/webfonts/fa-regular-400.ttf) ++ content/browser/manual/static/fonts/fontawesome/webfonts/fa-regular-400.woff (content/manual/static/fonts/fontawesome/webfonts/fa-regular-400.woff) ++ content/browser/manual/static/fonts/fontawesome/webfonts/fa-regular-400.woff2 (content/manual/static/fonts/fontawesome/webfonts/fa-regular-400.woff2) ++ content/browser/manual/static/fonts/fontawesome/webfonts/fa-solid-900.eot (content/manual/static/fonts/fontawesome/webfonts/fa-solid-900.eot) ++ content/browser/manual/static/fonts/fontawesome/webfonts/fa-solid-900.svg (content/manual/static/fonts/fontawesome/webfonts/fa-solid-900.svg) ++ content/browser/manual/static/fonts/fontawesome/webfonts/fa-solid-900.ttf (content/manual/static/fonts/fontawesome/webfonts/fa-solid-900.ttf) ++ content/browser/manual/static/fonts/fontawesome/webfonts/fa-solid-900.woff (content/manual/static/fonts/fontawesome/webfonts/fa-solid-900.woff) ++ content/browser/manual/static/fonts/fontawesome/webfonts/fa-solid-900.woff2 (content/manual/static/fonts/fontawesome/webfonts/fa-solid-900.woff2) ++ content/browser/manual/static/fonts/grotesque/terminal-grotesque_open.otf (content/manual/static/fonts/grotesque/terminal-grotesque_open.otf) ++ content/browser/manual/static/images/android-censored.png (content/manual/static/images/android-censored.png) ++ content/browser/manual/static/images/android-configure.png (content/manual/static/images/android-configure.png) ++ content/browser/manual/static/images/android-connect.png (content/manual/static/images/android-connect.png) ++ content/browser/manual/static/images/android-new-identity.png (content/manual/static/images/android-new-identity.png) ++ content/browser/manual/static/images/android-provide-a-bridge.png (content/manual/static/images/android-provide-a-bridge.png) ++ content/browser/manual/static/images/android-provided-a-bridge.png (content/manual/static/images/android-provided-a-bridge.png) ++ content/browser/manual/static/images/android-security-settings.gif (content/manual/static/images/android-security-settings.gif) ++ content/browser/manual/static/images/android-select-a-bridge.png (content/manual/static/images/android-select-a-bridge.png) ++ content/browser/manual/static/images/android-selected-a-bridge.png (content/manual/static/images/android-selected-a-bridge.png) ++ content/browser/manual/static/images/android-uninstall-device-settings.png (content/manual/static/images/android-uninstall-device-settings.png) ++ content/browser/manual/static/images/android-uninstall-f-droid.png (content/manual/static/images/android-uninstall-f-droid.png) ++ content/browser/manual/static/images/android-uninstall-google-play.png (content/manual/static/images/android-uninstall-google-play.png) ++ content/browser/manual/static/images/android-update-f-droid.png (content/manual/static/images/android-update-f-droid.png) ++ content/browser/manual/static/images/android-update-google-play.png (content/manual/static/images/android-update-google-play.png) ++ content/browser/manual/static/images/android-view-logs.gif (content/manual/static/images/android-view-logs.gif) ++ content/browser/manual/static/images/bridge-qr.png (content/manual/static/images/bridge-qr.png) ++ content/browser/manual/static/images/bridgemoji.png (content/manual/static/images/bridgemoji.png) ++ content/browser/manual/static/images/built-in-bridge.png (content/manual/static/images/built-in-bridge.png) ++ content/browser/manual/static/images/circuit_full.png (content/manual/static/images/circuit_full.png) ++ content/browser/manual/static/images/client-auth.png (content/manual/static/images/client-auth.png) ++ content/browser/manual/static/images/configure.png (content/manual/static/images/configure.png) ++ content/browser/manual/static/images/connect.png (content/manual/static/images/connect.png) ++ content/browser/manual/static/images/connection-assist-auto.png (content/manual/static/images/connection-assist-auto.png) ++ content/browser/manual/static/images/connection-assist-offline.png (content/manual/static/images/connection-assist-offline.png) ++ content/browser/manual/static/images/connection-assist-select.png (content/manual/static/images/connection-assist-select.png) ++ content/browser/manual/static/images/connection-assist-test.png (content/manual/static/images/connection-assist-test.png) ++ content/browser/manual/static/images/connection-test-failure.png (content/manual/static/images/connection-test-failure.png) ++ content/browser/manual/static/images/connection-test-success.png (content/manual/static/images/connection-test-success.png) ++ content/browser/manual/static/images/gettor-bot-telegram.png (content/manual/static/images/gettor-bot-telegram.png) ++ content/browser/manual/static/images/how-tor-works.png (content/manual/static/images/how-tor-works.png) ++ content/browser/manual/static/images/http-website-error.png (content/manual/static/images/http-website-error.png) ++ content/browser/manual/static/images/https-only-mode.png (content/manual/static/images/https-only-mode.png) ++ content/browser/manual/static/images/linux-make-desktop-file-executable.png (content/manual/static/images/linux-make-desktop-file-executable.png) ++ content/browser/manual/static/images/macos-go-to-folder-menu.png (content/manual/static/images/macos-go-to-folder-menu.png) ++ content/browser/manual/static/images/macos-go-to-folder-window.png (content/manual/static/images/macos-go-to-folder-window.png) ++ content/browser/manual/static/images/new_identity.png (content/manual/static/images/new_identity.png) ++ content/browser/manual/static/images/onion-location.png (content/manual/static/images/onion-location.png) ++ content/browser/manual/static/images/pluggable-transport.png (content/manual/static/images/pluggable-transport.png) ++ content/browser/manual/static/images/provide-bridge.png (content/manual/static/images/provide-bridge.png) ++ content/browser/manual/static/images/proxy.png (content/manual/static/images/proxy.png) ++ content/browser/manual/static/images/quickstart.png (content/manual/static/images/quickstart.png) ++ content/browser/manual/static/images/request-a-bridge.png (content/manual/static/images/request-a-bridge.png) ++ content/browser/manual/static/images/security-settings-anim.gif (content/manual/static/images/security-settings-anim.gif) ++ content/browser/manual/static/images/security-settings-safest.png (content/manual/static/images/security-settings-safest.png) ++ content/browser/manual/static/images/tor-https-0.png (content/manual/static/images/tor-https-0.png) ++ content/browser/manual/static/images/tor-https-1.png (content/manual/static/images/tor-https-1.png) ++ content/browser/manual/static/images/tor-https-2.png (content/manual/static/images/tor-https-2.png) ++ content/browser/manual/static/images/tor-https-3.png (content/manual/static/images/tor-https-3.png) ++ content/browser/manual/static/images/update1.png (content/manual/static/images/update1.png) ++ content/browser/manual/static/images/update4.png (content/manual/static/images/update4.png) ++ content/browser/manual/static/js/anchor.min.js (content/manual/static/js/anchor.min.js) ++ content/browser/manual/static/js/bootstrap.bundle.js (content/manual/static/js/bootstrap.bundle.js) ++ content/browser/manual/static/js/bootstrap.bundle.js.map (content/manual/static/js/bootstrap.bundle.js.map) ++ content/browser/manual/static/js/bootstrap.bundle.min.js (content/manual/static/js/bootstrap.bundle.min.js) ++ content/browser/manual/static/js/bootstrap.bundle.min.js.map (content/manual/static/js/bootstrap.bundle.min.js.map) ++ content/browser/manual/static/js/bootstrap.js (content/manual/static/js/bootstrap.js) ++ content/browser/manual/static/js/bootstrap.js.map (content/manual/static/js/bootstrap.js.map) ++ content/browser/manual/static/js/bootstrap.min.js (content/manual/static/js/bootstrap.min.js) ++ content/browser/manual/static/js/bootstrap.min.js.map (content/manual/static/js/bootstrap.min.js.map) ++ content/browser/manual/static/js/clipboard.min.js (content/manual/static/js/clipboard.min.js) ++ content/browser/manual/static/js/collapse.min.js (content/manual/static/js/collapse.min.js) ++ content/browser/manual/static/js/download.js (content/manual/static/js/download.js) ++ content/browser/manual/static/js/errors.js (content/manual/static/js/errors.js) ++ content/browser/manual/static/js/fallback.js (content/manual/static/js/fallback.js) ++ content/browser/manual/static/js/holder.min.js (content/manual/static/js/holder.min.js) ++ content/browser/manual/static/js/jquery-3.2.1.min.js (content/manual/static/js/jquery-3.2.1.min.js) ++ content/browser/manual/static/js/jquery-slim.min.js (content/manual/static/js/jquery-slim.min.js) ++ content/browser/manual/static/js/modernizr.js (content/manual/static/js/modernizr.js) ++ content/browser/manual/static/js/popper.min.js (content/manual/static/js/popper.min.js) ++ content/browser/manual/static/js/scrollspy.min.js (content/manual/static/js/scrollspy.min.js) ++ content/browser/manual/static/js/util.min.js (content/manual/static/js/util.min.js) ++ content/browser/manual/sw.html (content/manual/sw.html) ++ content/browser/manual/th.html (content/manual/th.html) ++ content/browser/manual/tr.html (content/manual/tr.html) ++ content/browser/manual/uk.html (content/manual/uk.html) ++ content/browser/manual/vi.html (content/manual/vi.html) ++ content/browser/manual/zh-CN.html (content/manual/zh-CN.html) ++ content/browser/manual/zh-TW.html (content/manual/zh-TW.html) diff --git a/www/tor-browser/files/patch-browser_app_profile_000-tor-browser.js b/www/tor-browser/files/patch-browser_app_profile_000-tor-browser.js index 7ad39b423..33dc6cdb0 100644 --- a/www/tor-browser/files/patch-browser_app_profile_000-tor-browser.js +++ b/www/tor-browser/files/patch-browser_app_profile_000-tor-browser.js @@ -1,6 +1,9 @@ ---- browser/app/profile/000-tor-browser.js.orig 2022-11-30 11:37:40 UTC +Set all path-related prefs to minimize patching of tl-util.jsm/tl-process.js + +Index: browser/app/profile/000-tor-browser.js +--- browser/app/profile/000-tor-browser.js.orig +++ browser/app/profile/000-tor-browser.js -@@ -123,14 +123,17 @@ pref("extensions.torlauncher.socks_port_flags", "Exten +@@ -100,7 +100,10 @@ pref("extensions.torlauncher.socks_port_flags", "Exten // The tor_path is relative to the application directory. On Linux and // Windows this is the Browser/ directory that contains the firefox // executables, and on Mac OS it is the TorBrowser.app directory. @@ -12,12 +15,3 @@ // The torrc_path and tordatadir_path are relative to the data directory, // which is TorBrowser-Data/ if it exists as a sibling of the application - // directory. If TorBrowser-Data/ does not exist, these paths are relative - // to the TorBrowser/ directory within the application directory. --pref("extensions.torlauncher.torrc_path", ""); --pref("extensions.torlauncher.tordatadir_path", ""); -+pref("extensions.torlauncher.torrc_path", "torrc"); -+pref("extensions.torlauncher.tordatadir_path", "tor_data"); - - // BridgeDB-related preferences (used for Moat). - pref("extensions.torlauncher.bridgedb_front", "cdn.sstatic.net"); diff --git a/www/tor-browser/files/patch-bug1427152 b/www/tor-browser/files/patch-bug1427152 new file mode 100644 index 000000000..49bd5a581 --- /dev/null +++ b/www/tor-browser/files/patch-bug1427152 @@ -0,0 +1,10 @@ +--- modules/libpref/Preferences.cpp.orig 2023-05-11 21:42:41 UTC ++++ modules/libpref/Preferences.cpp +@@ -6126,6 +6126,7 @@ static const PrefListEntry sDynamicPrefOverrideList[]{ + PREF_LIST_ENTRY("logging.config.LOG_FILE"), + PREF_LIST_ENTRY("media.audio_loopback_dev"), + PREF_LIST_ENTRY("media.decoder-doctor."), ++ PREF_LIST_ENTRY("media.cubeb.backend"), + PREF_LIST_ENTRY("media.cubeb.output_device"), + PREF_LIST_ENTRY("media.getusermedia.fake-camera-name"), + PREF_LIST_ENTRY("media.hls.server.url"), diff --git a/www/tor-browser/files/patch-bug1504834_comment5 b/www/tor-browser/files/patch-bug1504834_comment5 index 4d4886823..b9897e0b7 100644 --- a/www/tor-browser/files/patch-bug1504834_comment5 +++ b/www/tor-browser/files/patch-bug1504834_comment5 @@ -37,10 +37,8 @@ index 6b3bdc7..7c6c342 100644 // The following values are OS and endian-independent synonyms. // -diff --git gfx/skia/skia/third_party/skcms/skcms.cc gfx/skia/skia/third_party/skcms/skcms.cc -index 6b4d87b..7c0559d 100644 ---- gfx/skia/skia/third_party/skcms/skcms.cc -+++ gfx/skia/skia/third_party/skcms/skcms.cc +--- gfx/skia/skia/modules/skcms/skcms.cc.orig ++++ gfx/skia/skia/modules/skcms/skcms.cc @@ -30,6 +30,8 @@ #include #include @@ -49,8 +47,8 @@ index 6b4d87b..7c0559d 100644 + #define SKCMS_PORTABLE #endif - // sizeof(x) will return size_t, which is 32-bit on some machines and 64-bit on others. -@@ -280,20 +282,28 @@ enum { + static bool runtime_cpu_detection = true; +@@ -324,20 +326,28 @@ static uint16_t read_big_u16(const uint8_t* ptr) { uint16_t be; memcpy(&be, ptr, sizeof(be)); diff --git a/www/tor-browser/files/patch-bug1504834_comment9 b/www/tor-browser/files/patch-bug1504834_comment9 deleted file mode 100644 index c3d149ffa..000000000 --- a/www/tor-browser/files/patch-bug1504834_comment9 +++ /dev/null @@ -1,49 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=1504834#c9 -https://bugzilla.mozilla.org/attachment.cgi?id=9111146 -mozilla-bmo1504834-part3.patch - - -# HG changeset patch -# Parent aecb4600e5da17443b224c79eee178c1d8e155e3 -For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text and icons of the sandwich-menu to the -right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white). - -diff -r aecb4600e5da gfx/skia/skia/include/private/SkNx.h ---- gfx/skia/skia/include/private/SkNx.h Tue Aug 20 09:46:55 2019 +0200 -+++ gfx/skia/skia/include/private/SkNx.h Mon Sep 09 10:04:06 2019 +0200 -@@ -238,7 +238,18 @@ - AI SkNx operator*(const SkNx& y) const { return fVal * y.fVal; } - AI SkNx operator/(const SkNx& y) const { return fVal / y.fVal; } - -+ // On Big endian the commented out variant doesn't work, -+ // and honestly, I have no idea why it exists in the first place. -+ // The reason its broken is, I think, that it defaults to the double-variant of ToBits() -+ // which gets a 64-bit integer, and FromBits returns 32-bit, -+ // cutting off the wrong half again. -+ // Overall, I see no reason to have ToBits and FromBits at all (even for floats/doubles). -+ // Still we are only "fixing" this for big endian and leave little endian alone (never touch a running system) -+#ifdef SK_CPU_BENDIAN -+ AI SkNx operator&(const SkNx& y) const { return fVal & y.fVal; } -+#else - AI SkNx operator&(const SkNx& y) const { return FromBits(ToBits(fVal) & ToBits(y.fVal)); } -+#endif - AI SkNx operator|(const SkNx& y) const { return FromBits(ToBits(fVal) | ToBits(y.fVal)); } - AI SkNx operator^(const SkNx& y) const { return FromBits(ToBits(fVal) ^ ToBits(y.fVal)); } - -diff -r aecb4600e5da gfx/skia/skia/src/opts/SkBlitMask_opts.h ---- gfx/skia/skia/src/opts/SkBlitMask_opts.h Tue Aug 20 09:46:55 2019 +0200 -+++ gfx/skia/skia/src/opts/SkBlitMask_opts.h Mon Sep 09 10:04:06 2019 +0200 -@@ -203,7 +203,13 @@ - // ~~~> - // a = 1*aa + d(1-1*aa) = aa + d(1-aa) - // c = 0*aa + d(1-1*aa) = d(1-aa) -+ -+ // For big endian we have to swap the alpha-mask from 0,0,0,255 to 255,0,0,0 -+#ifdef SK_CPU_BENDIAN -+ return Sk4px(Sk16b(aa) & Sk16b(255,0,0,0, 255,0,0,0, 255,0,0,0, 255,0,0,0)) -+#else - return Sk4px(Sk16b(aa) & Sk16b(0,0,0,255, 0,0,0,255, 0,0,0,255, 0,0,0,255)) -+#endif - + d.approxMulDiv255(aa.inv()); - }; - while (h --> 0) { diff --git a/www/tor-browser/files/patch-bug1559213 b/www/tor-browser/files/patch-bug1559213 index 09b4dcc58..49bbb0fb0 100644 --- a/www/tor-browser/files/patch-bug1559213 +++ b/www/tor-browser/files/patch-bug1559213 @@ -63,26 +63,27 @@ index 8509aec..eb6f129 100644 EXPORTS += [ diff --git media/ffvpx/libavcodec/moz.build media/ffvpx/libavcodec/moz.build index 0069865..e806fc8 100644 ---- media/ffvpx/libavcodec/moz.build +--- media/ffvpx/libavcodec/moz.build.orig +++ media/ffvpx/libavcodec/moz.build -@@ -112,9 +112,15 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']: - 'vaapi_vp8.c', - 'vaapi_vp9.c', - ] -+ if CONFIG["MOZ_SYSTEM_AV1"]: -+ CFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS'] -+ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS'] -+ else: -+ USE_LIBS += [ -+ 'dav1d', -+ 'media_libdav1d_asm', -+ ] - USE_LIBS += [ -- 'dav1d', -- 'media_libdav1d_asm', - 'mozva' - ] - +@@ -108,10 +108,14 @@ + 'vp9prob.c', + 'vp9recon.c' + ] +- USE_LIBS += [ +- 'dav1d', +- 'media_libdav1d_asm', +- ] ++ if CONFIG["MOZ_SYSTEM_AV1"]: ++ CFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS'] ++ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS'] ++ else: ++ USE_LIBS += [ ++ 'dav1d', ++ 'media_libdav1d_asm', ++ ] + if CONFIG['MOZ_WAYLAND']: + LOCAL_INCLUDES += ['/media/mozva'] + SOURCES += [ diff --git toolkit/moz.configure toolkit/moz.configure index 0069865..e806fc8 100644 --- toolkit/moz.configure diff --git a/www/tor-browser/files/patch-bug1626236 b/www/tor-browser/files/patch-bug1626236 index ae3b522f6..ccb417b61 100644 --- a/www/tor-browser/files/patch-bug1626236 +++ b/www/tor-browser/files/patch-bug1626236 @@ -9,11 +9,10 @@ https://bug1626236.bmoattachments.org/attachment.cgi?id=9137096 # Parent 9cd90914846f667f18babc491a74c164ae5d6e9f imported patch decoder_workaround.patch -diff --git image/decoders/nsGIFDecoder2.cpp image/decoders/nsGIFDecoder2.cpp -index ebb0b7d..d52ef47 100644 ---- image/decoders/nsGIFDecoder2.cpp -+++ image/decoders/nsGIFDecoder2.cpp -@@ -422,6 +422,9 @@ void nsGIFDecoder2::ConvertColormap(uint32_t* aColormap, uint32_t aColors) { +diff -r 9cd90914846f image/decoders/nsGIFDecoder2.cpp +--- image/decoders/nsGIFDecoder2.cpp Thu Feb 27 12:57:14 2020 +0100 ++++ image/decoders/nsGIFDecoder2.cpp Fri Mar 27 13:06:18 2020 +0100 +@@ -422,6 +422,9 @@ MOZ_ASSERT(mSwizzleFn); uint8_t* data = reinterpret_cast(aColormap); mSwizzleFn(data, data, aColors); @@ -23,11 +22,10 @@ index ebb0b7d..d52ef47 100644 } LexerResult nsGIFDecoder2::DoDecode(SourceBufferIterator& aIterator, -diff --git image/decoders/nsJPEGDecoder.cpp image/decoders/nsJPEGDecoder.cpp -index 9ea4403..d82772c 100644 ---- image/decoders/nsJPEGDecoder.cpp -+++ image/decoders/nsJPEGDecoder.cpp -@@ -257,6 +257,9 @@ LexerTransition nsJPEGDecoder::ReadJPEGData( +diff -r 9cd90914846f image/decoders/nsJPEGDecoder.cpp +--- image/decoders/nsJPEGDecoder.cpp Thu Feb 27 12:57:14 2020 +0100 ++++ image/decoders/nsJPEGDecoder.cpp Fri Mar 27 13:06:18 2020 +0100 +@@ -263,6 +263,9 @@ case JCS_YCbCr: // By default, we will output directly to BGRA. If we need to apply // special color transforms, this may change. @@ -37,7 +35,7 @@ index 9ea4403..d82772c 100644 switch (SurfaceFormat::OS_RGBX) { case SurfaceFormat::B8G8R8X8: mInfo.out_color_space = JCS_EXT_BGRX; -@@ -271,6 +274,7 @@ LexerTransition nsJPEGDecoder::ReadJPEGData( +@@ -277,6 +280,7 @@ mState = JPEG_ERROR; return Transition::TerminateFailure(); } @@ -45,11 +43,10 @@ index 9ea4403..d82772c 100644 break; case JCS_CMYK: case JCS_YCCK: -diff --git image/decoders/nsPNGDecoder.cpp image/decoders/nsPNGDecoder.cpp -index e3e4ef4..3cc7315 100644 ---- image/decoders/nsPNGDecoder.cpp -+++ image/decoders/nsPNGDecoder.cpp -@@ -356,7 +356,7 @@ LexerResult nsPNGDecoder::DoDecode(SourceBufferIterator& aIterator, +diff -r 9cd90914846f image/decoders/nsPNGDecoder.cpp +--- image/decoders/nsPNGDecoder.cpp Thu Feb 27 12:57:14 2020 +0100 ++++ image/decoders/nsPNGDecoder.cpp Fri Mar 27 13:06:18 2020 +0100 +@@ -361,7 +361,7 @@ IResumable* aOnResume) { MOZ_ASSERT(!HasError(), "Shouldn't call DoDecode after error!"); @@ -58,7 +55,7 @@ index e3e4ef4..3cc7315 100644 [=](State aState, const char* aData, size_t aLength) { switch (aState) { case State::PNG_DATA: -@@ -366,6 +366,14 @@ LexerResult nsPNGDecoder::DoDecode(SourceBufferIterator& aIterator, +@@ -371,6 +371,14 @@ } MOZ_CRASH("Unknown State"); }); @@ -73,11 +70,10 @@ index e3e4ef4..3cc7315 100644 } LexerTransition nsPNGDecoder::ReadPNGData( -diff --git image/decoders/nsWebPDecoder.cpp image/decoders/nsWebPDecoder.cpp -index e58ca92..2056ebb 100644 ---- image/decoders/nsWebPDecoder.cpp -+++ image/decoders/nsWebPDecoder.cpp -@@ -247,7 +247,12 @@ nsresult nsWebPDecoder::CreateFrame(const OrientedIntRect& aFrameRect) { +diff -r 9cd90914846f image/decoders/nsWebPDecoder.cpp +--- image/decoders/nsWebPDecoder.cpp Thu Feb 27 12:57:14 2020 +0100 ++++ image/decoders/nsWebPDecoder.cpp Fri Mar 27 13:06:18 2020 +0100 +@@ -237,7 +237,12 @@ // WebP doesn't guarantee that the alpha generated matches the hint in the // header, so we always need to claim the input is BGRA. If the output is // BGRX, swizzling will mask off the alpha channel. diff --git a/www/tor-browser/files/patch-bug1628567 b/www/tor-browser/files/patch-bug1628567 index 003ba36d3..32b0dc260 100644 --- a/www/tor-browser/files/patch-bug1628567 +++ b/www/tor-browser/files/patch-bug1628567 @@ -1,10 +1,10 @@ Don't pass --target when CC/CXX contains clang diff --git third_party/rust/cc/src/lib.rs third_party/rust/cc/src/lib.rs -index 8cafd2a..f40b746 100644 +index 9d133a0..273e520 100644 --- third_party/rust/cc/src/lib.rs +++ third_party/rust/cc/src/lib.rs -@@ -2796,24 +2796,7 @@ impl Tool { +@@ -2667,24 +2667,7 @@ impl Tool { } fn with_features(path: PathBuf, clang_driver: Option<&str>, cuda: bool) -> Self { diff --git a/www/tor-browser/files/patch-bug1640982 b/www/tor-browser/files/patch-bug1640982 deleted file mode 100644 index 5ad0fbad6..000000000 --- a/www/tor-browser/files/patch-bug1640982 +++ /dev/null @@ -1,17 +0,0 @@ -Unbreak build with Rust 1.45.0 - -error: options `-C embed-bitcode=no` and `-C lto` are incompatible - -diff --git config/makefiles/rust.mk config/makefiles/rust.mk -index 75570d3..94ec33f 100644 ---- config/makefiles/rust.mk -+++ config/makefiles/rust.mk -@@ -97,7 +97,7 @@ ifndef rustflags_sancov - # Never enable when coverage is enabled to work around https://github.com/rust-lang/rust/issues/90045. - ifndef MOZ_CODE_COVERAGE - ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE))) --cargo_rustc_flags += -Clto -+cargo_rustc_flags += - endif - # We need -Cembed-bitcode=yes for all crates when using -Clto. - RUSTFLAGS += -Cembed-bitcode=yes diff --git a/www/tor-browser/files/patch-bug1659612 b/www/tor-browser/files/patch-bug1659612 index dce125b88..a7aea9773 100644 --- a/www/tor-browser/files/patch-bug1659612 +++ b/www/tor-browser/files/patch-bug1659612 @@ -20,16 +20,22 @@ media/libcubeb/src/cubeb_alsa.c:1168:3: note: include the header or e ^ 2 errors generated. ---- media/libcubeb/src/cubeb_alsa.c.orig 2021-08-31 14:26:24.530548000 +0200 -+++ media/libcubeb/src/cubeb_alsa.c 2021-08-31 14:26:43.081470000 +0200 -@@ -5,9 +5,7 @@ +--- media/libcubeb/src/cubeb_alsa.c.orig 2023-03-29 20:51:00.139281000 +0200 ++++ media/libcubeb/src/cubeb_alsa.c 2023-03-29 20:51:46.219013000 +0200 +@@ -5,12 +5,16 @@ * accompanying file LICENSE for details. */ #undef NDEBUG --#define _DEFAULT_SOURCE --#define _BSD_SOURCE --#define _XOPEN_SOURCE 500 -+#define _GNU_SOURCE 1 ++#if defined(__FreeBSD__) ++#define _GNU_SOURCE ++#else + #define _DEFAULT_SOURCE + #define _BSD_SOURCE + #if defined(__NetBSD__) + #define _NETBSD_SOURCE /* timersub() */ + #endif + #define _XOPEN_SOURCE 500 ++#endif #include "cubeb-internal.h" #include "cubeb/cubeb.h" - #include + #include "cubeb_tracing.h" diff --git a/www/tor-browser/files/patch-bug1664115 b/www/tor-browser/files/patch-bug1664115 deleted file mode 100644 index 3be934a8c..000000000 --- a/www/tor-browser/files/patch-bug1664115 +++ /dev/null @@ -1,82 +0,0 @@ -Revert bug 1647717 to workaround the issue of occational tab crashing when -using any cubeb backends other than pulse-rust to play media. The loss of -such change will be that users will not be able to do profiling on threads -created by libcubeb. - ---- dom/media/AudioStream.cpp.orig 2022-04-19 19:43:36.505544000 +0200 -+++ dom/media/AudioStream.cpp 2022-04-19 19:47:53.111474000 +0200 -@@ -27,7 +27,6 @@ - #endif - #include "Tracing.h" - #include "webaudio/blink/DenormalDisabler.h" --#include "AudioThreadRegistry.h" - #include "mozilla/StaticPrefs_media.h" - - // Use abort() instead of exception in SoundTouch. -@@ -144,8 +143,6 @@ - mOutChannels(aOutputChannels), - mState(INITIALIZED), - mDataSource(aSource), -- mAudioThreadId(ProfilerThreadId{}), -- mSandboxed(CubebUtils::SandboxEnabled()), - mPlaybackComplete(false), - mPlaybackRate(1.0f), - mPreservesPitch(true) {} -@@ -552,17 +549,6 @@ - aWriter.Available()); - } - --bool AudioStream::CheckThreadIdChanged() { -- ProfilerThreadId id = profiler_current_thread_id(); -- if (id != mAudioThreadId) { -- mAudioThreadId = id; -- mAudioThreadChanged = true; -- return true; -- } -- mAudioThreadChanged = false; -- return false; --} -- - void AudioStream::AssertIsOnAudioThread() const { - // This can be called right after CheckThreadIdChanged, because the audio - // thread can change when not sandboxed. -@@ -591,9 +577,6 @@ - } - - long AudioStream::DataCallback(void* aBuffer, long aFrames) { -- if (CheckThreadIdChanged() && !mSandboxed) { -- CubebUtils::GetAudioThreadRegistry()->Register(mAudioThreadId); -- } - WebCore::DenormalDisabler disabler; - - TRACE_AUDIO_CALLBACK_BUDGET(aFrames, mAudioClock.GetInputRate()); -@@ -648,9 +631,6 @@ - mDumpFile.Write(static_cast(aBuffer), - aFrames * mOutChannels); - -- if (!mSandboxed && writer.Available() != 0) { -- CubebUtils::GetAudioThreadRegistry()->Unregister(mAudioThreadId); -- } - return aFrames - writer.Available(); - } - ---- dom/media/AudioStream.h.orig 2022-04-19 19:43:45.457171000 +0200 -+++ dom/media/AudioStream.h 2022-04-19 19:45:30.463633000 +0200 -@@ -329,7 +329,6 @@ - - template - int InvokeCubeb(Function aFunction, Args&&... aArgs) REQUIRES(mMonitor); -- bool CheckThreadIdChanged(); - void AssertIsOnAudioThread() const; - - soundtouch::SoundTouch* mTimeStretcher; -@@ -368,9 +367,6 @@ - // the default device is used. It is set - // during the Init() in decoder thread. - RefPtr mSinkInfo; -- // Contains the id of the audio thread, from profiler_get_thread_id. -- std::atomic mAudioThreadId; -- const bool mSandboxed = false; - - MozPromiseHolder mEndedPromise GUARDED_BY(mMonitor); - std::atomic mPlaybackComplete; diff --git a/www/tor-browser/files/patch-bug1729459_comment12 b/www/tor-browser/files/patch-bug1729459_comment12 deleted file mode 100644 index dda42170f..000000000 --- a/www/tor-browser/files/patch-bug1729459_comment12 +++ /dev/null @@ -1,93 +0,0 @@ ---- modules/fdlibm/src/math_private.h.orig 2021-09-30 19:32:33.764224000 +0200 -+++ modules/fdlibm/src/math_private.h 2021-10-02 22:15:33.265122000 +0200 -@@ -30,7 +30,11 @@ - * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t - */ - --typedef double __double_t; -+#ifdef __LP64__ -+typedef double __double_t; -+#else -+typedef long double __double_t; -+#endif - typedef __double_t double_t; - - /* -@@ -630,7 +634,37 @@ - return ((double)(x + 0x1.8p52) - 0x1.8p52); - } - -+static inline float -+rnintf(__float_t x) -+{ -+ /* -+ * As for rnint(), except we could just call that to handle the -+ * extra precision case, usually without losing efficiency. -+ */ -+ return ((float)(x + 0x1.8p23F) - 0x1.8p23F); -+} -+ -+#ifdef LDBL_MANT_DIG - /* -+ * The complications for extra precision are smaller for rnintl() since it -+ * can safely assume that the rounding precision has been increased from -+ * its default to FP_PE on x86. We don't exploit that here to get small -+ * optimizations from limiting the rangle to double. We just need it for -+ * the magic number to work with long doubles. ld128 callers should use -+ * rnint() instead of this if possible. ld80 callers should prefer -+ * rnintl() since for amd64 this avoids swapping the register set, while -+ * for i386 it makes no difference (assuming FP_PE), and for other arches -+ * it makes little difference. -+ */ -+static inline long double -+rnintl(long double x) -+{ -+ return (x + __CONCAT(0x1.8p, LDBL_MANT_DIG) / 2 - -+ __CONCAT(0x1.8p, LDBL_MANT_DIG) / 2); -+} -+#endif /* LDBL_MANT_DIG */ -+ -+/* - * irint() and i64rint() give the same result as casting to their integer - * return type provided their arg is a floating point integer. They can - * sometimes be more efficient because no rounding is required. -@@ -644,6 +678,39 @@ - sizeof(x) == sizeof(long double) ? irintl(x) : (int)(x)) - #else - #define irint(x) ((int)(x)) -+#endif -+ -+#define i64rint(x) ((int64_t)(x)) /* only needed for ld128 so not opt. */ -+ -+#if defined(__i386__) && defined(__GNUCLIKE_ASM) -+static __inline int -+irintf(float x) -+{ -+ int n; -+ -+ __asm("fistl %0" : "=m" (n) : "t" (x)); -+ return (n); -+} -+ -+static __inline int -+irintd(double x) -+{ -+ int n; -+ -+ __asm("fistl %0" : "=m" (n) : "t" (x)); -+ return (n); -+} -+#endif -+ -+#if (defined(__amd64__) || defined(__i386__)) && defined(__GNUCLIKE_ASM) -+static __inline int -+irintl(long double x) -+{ -+ int n; -+ -+ __asm("fistl %0" : "=m" (n) : "t" (x)); -+ return (n); -+} - #endif - - #ifdef DEBUG diff --git a/www/tor-browser/files/patch-bug847568 b/www/tor-browser/files/patch-bug847568 index 3161dbb88..2b3c5e14e 100644 --- a/www/tor-browser/files/patch-bug847568 +++ b/www/tor-browser/files/patch-bug847568 @@ -97,13 +97,9 @@ index b91d9c1..a97e6eb 100755 echo If gfx/graphite2/src/files.mk has changed, please make corresponding diff --git gfx/harfbuzz/README-mozilla gfx/harfbuzz/README-mozilla index 3180257..4587a3b 100644 ---- gfx/harfbuzz/README-mozilla -+++ gfx/harfbuzz/README-mozilla -@@ -21,3 +21,8 @@ from within the gfx/harfbuzz directory. - - If the collection of source files changes, manual updates to moz.build may be - needed as we don't use the upstream makefiles. -+ +--- /dev/null ++++ gfx/harfbuzz/README-mozilla.fbsd +@@ -0,0 +1,4 @@ +The in-tree copy may be omitted during build by --with-system-harfbuzz. +Make sure to keep pkg-config version check within toolkit/moz.configure in sync +with checkout version or increment latest tag by one if it's not based diff --git a/www/tor-browser/files/patch-gfx_skia_skia_src_base_SkEndian.h b/www/tor-browser/files/patch-gfx_skia_skia_src_base_SkEndian.h new file mode 100644 index 000000000..656127071 --- /dev/null +++ b/www/tor-browser/files/patch-gfx_skia_skia_src_base_SkEndian.h @@ -0,0 +1,11 @@ +--- gfx/skia/skia/src/base/SkEndian.h.orig 2023-06-16 01:32:16.999830000 +0200 ++++ gfx/skia/skia/src/base/SkEndian.h 2023-06-16 01:32:41.701673000 +0200 +@@ -131,7 +131,7 @@ + #define SkTEndian_SwapLE64(n) (n) + #else // SK_CPU_BENDIAN + #define SkEndian_SwapBE16(n) (n) +- #define SkEndian_SwapBE32(n) (n) ++ #define SkEndian_SwapBE32(n) uint32_t(n) + #define SkEndian_SwapBE64(n) (n) + #define SkEndian_SwapLE16(n) SkEndianSwap16(n) + #define SkEndian_SwapLE32(n) SkEndianSwap32(n) diff --git a/www/tor-browser/files/patch-gfx_skia_skia_src_core_SkRasterPipeline.h b/www/tor-browser/files/patch-gfx_skia_skia_src_core_SkRasterPipeline.h new file mode 100644 index 000000000..64e279cf2 --- /dev/null +++ b/www/tor-browser/files/patch-gfx_skia_skia_src_core_SkRasterPipeline.h @@ -0,0 +1,11 @@ +--- gfx/skia/skia/src/core/SkRasterPipeline.h.orig 2023-06-10 14:20:18.155477000 +0200 ++++ gfx/skia/skia/src/core/SkRasterPipeline.h 2023-06-10 14:20:30.760915000 +0200 +@@ -24,7 +24,7 @@ + struct SkImageInfo; + struct skcms_TransferFunction; + +-#if __has_cpp_attribute(clang::musttail) && !defined(__EMSCRIPTEN__) && !defined(SK_CPU_ARM32) ++#if __has_cpp_attribute(clang::musttail) && !defined(__EMSCRIPTEN__) && !defined(SK_CPU_ARM32) && !defined(__powerpc__) + #define SK_HAS_MUSTTAIL 1 + #else + #define SK_HAS_MUSTTAIL 0 diff --git a/www/tor-browser/files/patch-i386-protobuf-alignment b/www/tor-browser/files/patch-i386-protobuf-alignment new file mode 100644 index 000000000..0d58c8644 --- /dev/null +++ b/www/tor-browser/files/patch-i386-protobuf-alignment @@ -0,0 +1,15 @@ +# On FreeBSD/i386's LLVM, actual alignment for atomic types requires +# stricter alignment rules, mostly on 8 byte boundaries instead of 4 byte +# as indicated by max_align_t. + +--- ./toolkit/components/protobuf/src/google/protobuf/arena_impl.h.orig 2022-08-20 20:07:57.096818000 +0200 ++++ ./toolkit/components/protobuf/src/google/protobuf/arena_impl.h 2022-08-20 21:40:47.821690000 +0200 +@@ -640,7 +640,7 @@ + #ifdef _MSC_VER + #pragma warning(disable : 4324) + #endif +- struct alignas(kCacheAlignment) CacheAlignedLifecycleIdGenerator { ++ struct alignas(alignof(std::atomic)) CacheAlignedLifecycleIdGenerator { + std::atomic id; + }; + static CacheAlignedLifecycleIdGenerator lifecycle_id_generator_; diff --git a/www/tor-browser/files/patch-js_public_Utility.h b/www/tor-browser/files/patch-js_public_Utility.h new file mode 100644 index 000000000..4c2e16bc9 --- /dev/null +++ b/www/tor-browser/files/patch-js_public_Utility.h @@ -0,0 +1,35 @@ +commit 57b30241311091b5a6a5a0bb1c19a8e073860fc3 +Author: Christoph Moench-Tegeder + + do not assert on alignment when not having the bits + + the underlying issue seemed to be win-only anyways? + +diff --git js/public/Utility.h js/public/Utility.h +index 0d745e9df785..f0ca7ea37162 100644 +--- js/public/Utility.h ++++ js/public/Utility.h +@@ -480,6 +480,7 @@ static inline void js_free(void* p) { + * Note: Do not add a ; at the end of a use of JS_DECLARE_NEW_METHODS, + * or the build will break. + */ ++#if !defined(__i386__) + #define JS_DECLARE_NEW_METHODS(NEWNAME, ALLOCATOR, QUALIFIERS) \ + template \ + QUALIFIERS T* MOZ_HEAP_ALLOCATOR NEWNAME(Args&&... args) { \ +@@ -490,6 +491,15 @@ static inline void js_free(void* p) { + return MOZ_LIKELY(memory) ? new (memory) T(std::forward(args)...) \ + : nullptr; \ + } ++#else ++#define JS_DECLARE_NEW_METHODS(NEWNAME, ALLOCATOR, QUALIFIERS) \ ++ template \ ++ QUALIFIERS T* MOZ_HEAP_ALLOCATOR NEWNAME(Args&&... args) { \ ++ void* memory = ALLOCATOR(sizeof(T)); \ ++ return MOZ_LIKELY(memory) ? new (memory) T(std::forward(args)...) \ ++ : nullptr; \ ++ } ++#endif + + /* + * Given a class which should provide a 'new' method that takes an arena as diff --git a/www/tor-browser/files/patch-libwebrtc-generate b/www/tor-browser/files/patch-libwebrtc-generate deleted file mode 100644 index 4ab631c9a..000000000 --- a/www/tor-browser/files/patch-libwebrtc-generate +++ /dev/null @@ -1,159 +0,0 @@ -# Below are the changes needed for generate-gn-build-files.sh -# except for depot_tools -# https://bugzilla.mozilla.org/show_bug.cgi?id=1654448 - -diff --git dom/media/webrtc/third_party_build/gn-configs/arm64_False_arm64_freebsd.mozconfig dom/media/webrtc/third_party_build/gn-configs/arm64_False_arm64_freebsd.mozconfig -new file mode 100644 -index 0000000000..7c76576969 ---- /dev/null -+++ dom/media/webrtc/third_party_build/gn-configs/arm64_False_arm64_freebsd.mozconfig -@@ -0,0 +1,12 @@ -+export M4=/usr/local/bin/gm4 -+export CC=/usr/local/bin/clang13 -+export CXX=/usr/local/bin/clang++13 -+export CPP=/usr/local/bin/clang-cpp13 -+ac_add_options --prefix="/usr/local" -+ac_add_options --with-libclang-path="/usr/local/llvm13/lib" -+ac_add_options --with-wasi-sysroot="/usr/local/share/wasi-sysroot" -+ -+ac_add_options --target=aarch64 -+ac_add_options --enable-bootstrap -+ -+mk_add_options MOZ_OBJDIR=obj-arm64_False_arm64_freebsd -diff --git dom/media/webrtc/third_party_build/gn-configs/arm64_True_arm64_freebsd.mozconfig dom/media/webrtc/third_party_build/gn-configs/arm64_True_arm64_freebsd.mozconfig -new file mode 100644 -index 0000000000..d056686355 ---- /dev/null -+++ dom/media/webrtc/third_party_build/gn-configs/arm64_True_arm64_freebsd.mozconfig -@@ -0,0 +1,13 @@ -+export M4=/usr/local/bin/gm4 -+export CC=/usr/local/bin/clang13 -+export CXX=/usr/local/bin/clang++13 -+export CPP=/usr/local/bin/clang-cpp13 -+ac_add_options --prefix="/usr/local" -+ac_add_options --with-libclang-path="/usr/local/llvm13/lib" -+ac_add_options --with-wasi-sysroot="/usr/local/share/wasi-sysroot" -+ -+ac_add_options --target=aarch64 -+ac_add_options --enable-debug -+ac_add_options --enable-bootstrap -+ -+mk_add_options MOZ_OBJDIR=obj-arm64_True_arm64_freebsd -diff --git dom/media/webrtc/third_party_build/gn-configs/x64_False_x64_freebsd.mozconfig dom/media/webrtc/third_party_build/gn-configs/x64_False_x64_freebsd.mozconfig -new file mode 100644 -index 0000000000..37319939ba ---- /dev/null -+++ dom/media/webrtc/third_party_build/gn-configs/x64_False_x64_freebsd.mozconfig -@@ -0,0 +1,11 @@ -+export M4=/usr/local/bin/gm4 -+export CC=/usr/local/bin/clang13 -+export CXX=/usr/local/bin/clang++13 -+export CPP=/usr/local/bin/clang-cpp13 -+ac_add_options --prefix="/usr/local" -+ac_add_options --with-libclang-path="/usr/local/llvm13/lib" -+ac_add_options --with-wasi-sysroot="/usr/local/share/wasi-sysroot" -+ -+ac_add_options --enable-bootstrap -+ -+mk_add_options MOZ_OBJDIR=obj-x64_False_x64_freebsd -diff --git dom/media/webrtc/third_party_build/gn-configs/x64_False_x86_freebsd.mozconfig dom/media/webrtc/third_party_build/gn-configs/x64_False_x86_freebsd.mozconfig -new file mode 100644 -index 0000000000..4bcac5d797 ---- /dev/null -+++ dom/media/webrtc/third_party_build/gn-configs/x64_False_x86_freebsd.mozconfig -@@ -0,0 +1,12 @@ -+export M4=/usr/local/bin/gm4 -+export CC=/usr/local/bin/clang13 -+export CXX=/usr/local/bin/clang++13 -+export CPP=/usr/local/bin/clang-cpp13 -+ac_add_options --prefix="/usr/local" -+ac_add_options --with-libclang-path="/usr/local/llvm13/lib" -+ac_add_options --with-wasi-sysroot="/usr/local/share/wasi-sysroot" -+ -+ac_add_options --target=i686 -+ac_add_options --enable-bootstrap -+ -+mk_add_options MOZ_OBJDIR=obj-x64_False_x86_freebsd -diff --git dom/media/webrtc/third_party_build/gn-configs/x64_True_x64_freebsd.mozconfig dom/media/webrtc/third_party_build/gn-configs/x64_True_x64_freebsd.mozconfig -new file mode 100644 -index 0000000000..7c5ae25d67 ---- /dev/null -+++ dom/media/webrtc/third_party_build/gn-configs/x64_True_x64_freebsd.mozconfig -@@ -0,0 +1,12 @@ -+export M4=/usr/local/bin/gm4 -+export CC=/usr/local/bin/clang13 -+export CXX=/usr/local/bin/clang++13 -+export CPP=/usr/local/bin/clang-cpp13 -+ac_add_options --prefix="/usr/local" -+ac_add_options --with-libclang-path="/usr/local/llvm13/lib" -+ac_add_options --with-wasi-sysroot="/usr/local/share/wasi-sysroot" -+ -+ac_add_options --enable-debug -+ac_add_options --enable-bootstrap -+ -+mk_add_options MOZ_OBJDIR=obj-x64_True_x64_freebsd -diff --git dom/media/webrtc/third_party_build/gn-configs/x64_True_x86_freebsd.mozconfig dom/media/webrtc/third_party_build/gn-configs/x64_True_x86_freebsd.mozconfig -new file mode 100644 -index 0000000000..ee95c64a23 ---- /dev/null -+++ dom/media/webrtc/third_party_build/gn-configs/x64_True_x86_freebsd.mozconfig -@@ -0,0 +1,13 @@ -+export M4=/usr/local/bin/gm4 -+export CC=/usr/local/bin/clang13 -+export CXX=/usr/local/bin/clang++13 -+export CPP=/usr/local/bin/clang-cpp13 -+ac_add_options --prefix="/usr/local" -+ac_add_options --with-libclang-path="/usr/local/llvm13/lib" -+ac_add_options --with-wasi-sysroot="/usr/local/share/wasi-sysroot" -+ -+ac_add_options --target=i686 -+ac_add_options --enable-debug -+ac_add_options --enable-bootstrap -+ -+mk_add_options MOZ_OBJDIR=obj-x64_True_x86_freebsd -diff --git third_party/libwebrtc/build/config/BUILDCONFIG.gn third_party/libwebrtc/build/config/BUILDCONFIG.gn -index fe6f5b7d2a..1092f99c65 100644 ---- third_party/libwebrtc/build/config/BUILDCONFIG.gn -+++ third_party/libwebrtc/build/config/BUILDCONFIG.gn -@@ -131,10 +131,12 @@ declare_args() { - is_official_build = false - - # Whether we're a traditional desktop unix. -- is_desktop_linux = current_os == "linux" || current_os == "openbsd" -+ is_desktop_linux = current_os == "linux" || current_os == "openbsd" || -+ current_os == "freebsd" - - # Set to true when compiling with the Clang compiler. - is_clang = current_os != "linux" || current_os == "openbsd" || -+ current_os == "freebsd" || - (current_cpu != "s390x" && current_cpu != "s390" && - current_cpu != "ppc64" && current_cpu != "ppc" && - current_cpu != "mips" && current_cpu != "mips64") -@@ -186,7 +188,7 @@ if (host_toolchain == "") { - # TODO(dpranke): Add some sort of assert here that verifies that - # no toolchain omitted host_toolchain from its toolchain_args(). - -- if (host_os == "linux" || host_os == "openbsd") { -+ if (host_os == "linux" || host_os == "openbsd" || host_os == "freebsd" ) { - if (target_os != "linux") { - host_toolchain = "//build/toolchain/linux:clang_$host_cpu" - } else if (is_clang) { -@@ -224,7 +226,8 @@ if (target_os == "android") { - assert(host_os == "linux" || host_os == "mac", - "Android builds are only supported on Linux and Mac hosts.") - _default_toolchain = "//build/toolchain/android:android_clang_$target_cpu" --} else if (target_os == "chromeos" || target_os == "linux" || target_os == "openbsd") { -+} else if (target_os == "chromeos" || target_os == "linux" || -+ target_os == "openbsd" || target_os == "freebsd") { - # See comments in build/toolchain/cros/BUILD.gn about board compiles. - if (is_clang) { - _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" -@@ -289,7 +292,7 @@ is_chromeos = current_os == "chromeos" - is_fuchsia = current_os == "fuchsia" - is_ios = current_os == "ios" - is_linux = current_os == "chromeos" || current_os == "linux" --is_bsd = current_os == "openbsd" -+is_bsd = current_os == "openbsd" || current_os == "freebsd" - is_mac = current_os == "mac" - is_nacl = current_os == "nacl" - is_win = current_os == "win" || current_os == "winuwp" diff --git a/www/tor-browser/files/patch-libwebrtc-generated b/www/tor-browser/files/patch-libwebrtc-generated index d7f0fdecd..9790b777a 100644 --- a/www/tor-browser/files/patch-libwebrtc-generated +++ b/www/tor-browser/files/patch-libwebrtc-generated @@ -1,19 +1,25 @@ +commit c15a16ffc6046403213dc435ecb26962706a0da4 +Author: Christoph Moench-Tegeder + + regenerate FreeBSD libwebrtc patch for Firefox 115esr + 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 445f027e82b0..c286ec3735a7 100644 +index aa958f70420c..e6a2d969a1fd 100644 --- third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build +++ third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -22,7 +28,7 @@ index 445f027e82b0..c286ec3735a7 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -30,7 +36,7 @@ index 445f027e82b0..c286ec3735a7 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -71,6 +77,7 @@ index 445f027e82b0..c286ec3735a7 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -105,10 +112,6 @@ index 445f027e82b0..c286ec3735a7 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -125,6 +128,24 @@ index 445f027e82b0..c286ec3735a7 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -159,10 +180,10 @@ index 445f027e82b0..c286ec3735a7 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -176,35 +197,40 @@ index 445f027e82b0..c286ec3735a7 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["USE_X11"] = "1" + 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 0ae35513c8c6..efaa7dd2f99c 100644 +index e453cb8585d0..552c7e77985a 100644 --- third_party/libwebrtc/api/array_view_gn/moz.build +++ third_party/libwebrtc/api/array_view_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -213,7 +239,7 @@ index 0ae35513c8c6..efaa7dd2f99c 100644 FINAL_LIBRARY = "webrtc" -@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -221,7 +247,7 @@ index 0ae35513c8c6..efaa7dd2f99c 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -262,6 +288,7 @@ index 0ae35513c8c6..efaa7dd2f99c 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -309,6 +336,22 @@ index 0ae35513c8c6..efaa7dd2f99c 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -330,9 +373,10 @@ index 0ae35513c8c6..efaa7dd2f99c 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -364,21 +408,22 @@ index 0ae35513c8c6..efaa7dd2f99c 100644 - Library("array_view_gn") diff --git third_party/libwebrtc/api/audio/aec3_config_gn/moz.build third_party/libwebrtc/api/audio/aec3_config_gn/moz.build -index fd8b99d9255f..682ad0f9d8bd 100644 +index c2d256488d9b..1b3eb3a6acb6 100644 --- third_party/libwebrtc/api/audio/aec3_config_gn/moz.build +++ third_party/libwebrtc/api/audio/aec3_config_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -387,7 +432,7 @@ index fd8b99d9255f..682ad0f9d8bd 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -395,7 +440,7 @@ index fd8b99d9255f..682ad0f9d8bd 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -436,6 +481,7 @@ index fd8b99d9255f..682ad0f9d8bd 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -470,10 +516,6 @@ index fd8b99d9255f..682ad0f9d8bd 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -490,6 +532,24 @@ index fd8b99d9255f..682ad0f9d8bd 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -524,10 +584,10 @@ index fd8b99d9255f..682ad0f9d8bd 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -541,29 +601,33 @@ index fd8b99d9255f..682ad0f9d8bd 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["USE_X11"] = "1" + 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 c60ef9015b87..1558ddeca767 100644 +index ecd28a700696..4e5509d7162d 100644 --- third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build +++ third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build -@@ -11,11 +11,20 @@ AllowCompilerWarnings() - +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +DEFINES["WEBRTC_BSD"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" @@ -571,6 +635,7 @@ index c60ef9015b87..1558ddeca767 100644 DEFINES["WEBRTC_MOZILLA_BUILD"] = True DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +DEFINES["WEBRTC_POSIX"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True @@ -579,7 +644,7 @@ index c60ef9015b87..1558ddeca767 100644 FINAL_LIBRARY = "webrtc" -@@ -41,171 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -587,7 +652,7 @@ index c60ef9015b87..1558ddeca767 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -632,6 +697,7 @@ index c60ef9015b87..1558ddeca767 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -689,6 +755,24 @@ index c60ef9015b87..1558ddeca767 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -722,8 +806,7 @@ index c60ef9015b87..1558ddeca767 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -741,34 +824,40 @@ index c60ef9015b87..1558ddeca767 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["USE_X11"] = "1" + Library("aec3_factory_gn") diff --git third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build -index ca213acc75c3..0c230f0ca1ee 100644 +index 6fac266c7368..ce2f85ba66dc 100644 --- third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build +++ third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -777,7 +866,7 @@ index ca213acc75c3..0c230f0ca1ee 100644 FINAL_LIBRARY = "webrtc" -@@ -41,164 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -785,7 +874,7 @@ index ca213acc75c3..0c230f0ca1ee 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -826,6 +915,7 @@ index ca213acc75c3..0c230f0ca1ee 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -880,6 +970,24 @@ index ca213acc75c3..0c230f0ca1ee 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -914,10 +1022,10 @@ index ca213acc75c3..0c230f0ca1ee 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -931,35 +1039,40 @@ index ca213acc75c3..0c230f0ca1ee 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("audio_frame_api_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 5da87da932c5..33ed59929936 100644 ---- third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build -+++ third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("audio_frame_api_gn") +diff --git third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build +index 1732aa7d0c9a..a6098a248028 100644 +--- third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build ++++ third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -968,7 +1081,7 @@ index 5da87da932c5..33ed59929936 100644 FINAL_LIBRARY = "webrtc" -@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -976,7 +1089,7 @@ index 5da87da932c5..33ed59929936 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -986,10 +1099,6 @@ index 5da87da932c5..33ed59929936 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -1017,6 +1126,7 @@ index 5da87da932c5..33ed59929936 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -1051,10 +1161,6 @@ index 5da87da932c5..33ed59929936 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -1068,6 +1174,22 @@ index 5da87da932c5..33ed59929936 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -1089,9 +1211,10 @@ index 5da87da932c5..33ed59929936 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -1121,23 +1244,24 @@ index 5da87da932c5..33ed59929936 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("audio_mixer_api_gn") -diff --git third_party/libwebrtc/api/audio/echo_control_gn/moz.build third_party/libwebrtc/api/audio/echo_control_gn/moz.build -index a5b0fc942700..32745274dc86 100644 ---- third_party/libwebrtc/api/audio/echo_control_gn/moz.build -+++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("audio_frame_processor_gn") +diff --git third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build +index 4eac2aa4b4f4..2df8ddd20ca2 100644 +--- third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build ++++ third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -1146,7 +1270,7 @@ index a5b0fc942700..32745274dc86 100644 FINAL_LIBRARY = "webrtc" -@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -1154,7 +1278,7 @@ index a5b0fc942700..32745274dc86 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -1195,6 +1319,7 @@ index a5b0fc942700..32745274dc86 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -1229,6 +1354,10 @@ index a5b0fc942700..32745274dc86 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -1242,6 +1371,22 @@ index a5b0fc942700..32745274dc86 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -1263,9 +1408,10 @@ index a5b0fc942700..32745274dc86 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -1295,23 +1441,24 @@ index a5b0fc942700..32745274dc86 100644 - - 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 7864e79b32ff..cba0bad0a139 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("audio_mixer_api_gn") +diff --git third_party/libwebrtc/api/audio/echo_control_gn/moz.build third_party/libwebrtc/api/audio/echo_control_gn/moz.build +index 2e128f80386d..6e4054510c88 100644 +--- third_party/libwebrtc/api/audio/echo_control_gn/moz.build ++++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -1320,7 +1467,7 @@ index 7864e79b32ff..cba0bad0a139 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -1328,7 +1475,7 @@ index 7864e79b32ff..cba0bad0a139 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -1369,6 +1516,7 @@ index 7864e79b32ff..cba0bad0a139 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -1403,10 +1551,6 @@ index 7864e79b32ff..cba0bad0a139 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -1416,14 +1560,26 @@ index 7864e79b32ff..cba0bad0a139 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -1445,9 +1601,10 @@ index 7864e79b32ff..cba0bad0a139 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -1457,10 +1614,6 @@ index 7864e79b32ff..cba0bad0a139 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -1474,35 +1627,31 @@ index 7864e79b32ff..cba0bad0a139 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = 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 d5a7bad12a54..49bdfc9df78f 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("echo_control_gn") +diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build +index 87335c298d63..9f1caaa8645d 100644 +--- third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -1511,7 +1660,7 @@ index d5a7bad12a54..49bdfc9df78f 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -1519,7 +1668,7 @@ index d5a7bad12a54..49bdfc9df78f 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -1560,6 +1709,7 @@ index d5a7bad12a54..49bdfc9df78f 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -1614,6 +1764,24 @@ index d5a7bad12a54..49bdfc9df78f 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -1648,10 +1816,10 @@ index d5a7bad12a54..49bdfc9df78f 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -1665,35 +1833,40 @@ index d5a7bad12a54..49bdfc9df78f 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 11d2da68af0a..4a80f154a6ae 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("audio_decoder_L16_gn") +diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build +index 49e0d546f1ce..57de72563f2e 100644 +--- third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -1702,7 +1875,7 @@ index 11d2da68af0a..4a80f154a6ae 100644 FINAL_LIBRARY = "webrtc" -@@ -43,164 +52,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -1710,7 +1883,7 @@ index 11d2da68af0a..4a80f154a6ae 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -1751,6 +1924,7 @@ index 11d2da68af0a..4a80f154a6ae 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -1805,6 +1979,24 @@ index 11d2da68af0a..4a80f154a6ae 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -1839,10 +2031,10 @@ index 11d2da68af0a..4a80f154a6ae 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -1856,39 +2048,40 @@ index 11d2da68af0a..4a80f154a6ae 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 958e41ad74b0..bd2ff7551534 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 -@@ -11,12 +11,23 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("audio_encoder_L16_gn") +diff --git third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build +index 846946073ee1..0a34d8fdda8a 100644 +--- third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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_USE_BUILTIN_ILBC"] = "1" -+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["WEBRTC_USE_BUILTIN_OPUS"] = "1" + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True @@ -1897,7 +2090,7 @@ index 958e41ad74b0..bd2ff7551534 100644 FINAL_LIBRARY = "webrtc" -@@ -42,219 +53,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,183 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -1905,7 +2098,7 @@ index 958e41ad74b0..bd2ff7551534 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -1923,8 +2116,6 @@ index 958e41ad74b0..bd2ff7551534 100644 - - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" - DEFINES["__STDC_CONSTANT_MACROS"] = True @@ -1945,18 +2136,13 @@ index 958e41ad74b0..bd2ff7551534 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True @@ -1971,8 +2157,6 @@ index 958e41ad74b0..bd2ff7551534 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -1992,9 +2176,6 @@ index 958e41ad74b0..bd2ff7551534 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -2013,17 +2194,24 @@ index 958e41ad74b0..bd2ff7551534 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "1" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "0" - --if CONFIG["CPU_ARCH"] == "ppc64": + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True - -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" +-if CONFIG["CPU_ARCH"] == "mips64": - -- OS_LIBS += [ -- "m" -- ] +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -2049,11 +2237,6 @@ index 958e41ad74b0..bd2ff7551534 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -2062,82 +2245,59 @@ index 958e41ad74b0..bd2ff7551534 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -- - OS_LIBS += [ - "android_support" - ] - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -- -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_GNU_SOURCE"] = True - -- OS_LIBS += [ -- "m" -- ] -- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- -- OS_LIBS += [ -- "m" -- ] -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- -- OS_LIBS += [ -- "m" -- ] -- - 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 7f38bd927a31..422ce62ff20e 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 -@@ -11,12 +11,23 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("audio_codecs_api_gn") +diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build +index 366307ea13d7..7ea300e23f2a 100644 +--- third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build +@@ -12,13 +12,22 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["WEBRTC_USE_BUILTIN_ILBC"] = "1" -+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" DEFINES["WEBRTC_USE_BUILTIN_OPUS"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True @@ -2147,7 +2307,7 @@ index 7f38bd927a31..422ce62ff20e 100644 FINAL_LIBRARY = "webrtc" -@@ -42,219 +53,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -2155,7 +2315,7 @@ index 7f38bd927a31..422ce62ff20e 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -2173,8 +2333,6 @@ index 7f38bd927a31..422ce62ff20e 100644 - - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" - DEFINES["__STDC_CONSTANT_MACROS"] = True @@ -2202,11 +2360,10 @@ index 7f38bd927a31..422ce62ff20e 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True @@ -2221,8 +2378,6 @@ index 7f38bd927a31..422ce62ff20e 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -2263,17 +2418,24 @@ index 7f38bd927a31..422ce62ff20e 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "1" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "0" - --if CONFIG["CPU_ARCH"] == "ppc64": + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True - -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" +-if CONFIG["CPU_ARCH"] == "mips64": - -- OS_LIBS += [ -- "m" -- ] +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -2299,11 +2461,6 @@ index 7f38bd927a31..422ce62ff20e 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -2312,79 +2469,60 @@ index 7f38bd927a31..422ce62ff20e 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -- - OS_LIBS += [ - "android_support" - ] - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -- -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_GNU_SOURCE"] = True - -- OS_LIBS += [ -- "m" -- ] -- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- -- OS_LIBS += [ -- "m" -- ] -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- -- OS_LIBS += [ -- "m" -- ] -- - 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 497c53b37e51..d4c446208f12 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("builtin_audio_decoder_factory_gn") +diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build +index db0e3fbe00d5..0818f76d7b90 100644 +--- third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build +@@ -12,13 +12,22 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["WEBRTC_USE_BUILTIN_ILBC"] = "1" + DEFINES["WEBRTC_USE_BUILTIN_OPUS"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True @@ -2393,7 +2531,7 @@ index 497c53b37e51..d4c446208f12 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -2401,7 +2539,7 @@ index 497c53b37e51..d4c446208f12 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -2439,9 +2577,14 @@ index 497c53b37e51..d4c446208f12 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -2478,6 +2621,9 @@ index 497c53b37e51..d4c446208f12 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -2496,6 +2642,24 @@ index 497c53b37e51..d4c446208f12 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -2530,10 +2694,10 @@ index 497c53b37e51..d4c446208f12 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -2547,35 +2711,40 @@ index 497c53b37e51..d4c446208f12 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 eebd82c6c4ce..0bcb11877868 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("builtin_audio_encoder_factory_gn") +diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build +index 4782d01dd10f..588ec3b5b33b 100644 +--- third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -2584,7 +2753,7 @@ index eebd82c6c4ce..0bcb11877868 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -2592,7 +2761,7 @@ index eebd82c6c4ce..0bcb11877868 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -2633,6 +2802,7 @@ index eebd82c6c4ce..0bcb11877868 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -2687,6 +2857,24 @@ index eebd82c6c4ce..0bcb11877868 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -2721,10 +2909,10 @@ index eebd82c6c4ce..0bcb11877868 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -2738,35 +2926,40 @@ index eebd82c6c4ce..0bcb11877868 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 f5a808a4a891..b6e2080ea966 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("audio_decoder_g711_gn") +diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build +index c972978c13ef..20d76c5496fa 100644 +--- third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -2775,7 +2968,7 @@ index f5a808a4a891..b6e2080ea966 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -2783,7 +2976,7 @@ index f5a808a4a891..b6e2080ea966 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -2824,6 +3017,7 @@ index f5a808a4a891..b6e2080ea966 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -2878,6 +3072,24 @@ index f5a808a4a891..b6e2080ea966 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -2912,10 +3124,10 @@ index f5a808a4a891..b6e2080ea966 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -2929,35 +3141,40 @@ index f5a808a4a891..b6e2080ea966 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 2e9b5830dab5..195fa7f7ede5 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("audio_encoder_g711_gn") +diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build +index 77003c77a9dd..f738a9569a45 100644 +--- third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -2966,7 +3183,7 @@ index 2e9b5830dab5..195fa7f7ede5 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -2974,7 +3191,7 @@ index 2e9b5830dab5..195fa7f7ede5 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -2984,6 +3201,10 @@ index 2e9b5830dab5..195fa7f7ede5 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -3011,6 +3232,7 @@ index 2e9b5830dab5..195fa7f7ede5 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -3045,6 +3267,10 @@ index 2e9b5830dab5..195fa7f7ede5 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -3054,9 +3280,31 @@ index 2e9b5830dab5..195fa7f7ede5 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -3091,6 +3339,10 @@ index 2e9b5830dab5..195fa7f7ede5 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -3104,30 +3356,40 @@ index 2e9b5830dab5..195fa7f7ede5 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 4bc77ef9c8c7..8f0736157ebc 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("audio_decoder_g722_gn") +diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build +index 41e1e248c525..2cc917d90aab 100644 +--- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -3136,7 +3398,7 @@ index 4bc77ef9c8c7..8f0736157ebc 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -3144,7 +3406,7 @@ index 4bc77ef9c8c7..8f0736157ebc 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -3185,6 +3447,7 @@ index 4bc77ef9c8c7..8f0736157ebc 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -3232,14 +3495,26 @@ index 4bc77ef9c8c7..8f0736157ebc 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -3261,9 +3536,10 @@ index 4bc77ef9c8c7..8f0736157ebc 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -3273,10 +3549,6 @@ index 4bc77ef9c8c7..8f0736157ebc 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -3290,35 +3562,31 @@ index 4bc77ef9c8c7..8f0736157ebc 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("audio_encoder_g722_gn") -diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build -index 51a1be6760b3..49fff13a82bc 100644 ---- third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build -+++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("audio_encoder_g722_config_gn") +diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build +index c3beba6cdb78..8f13941e25c3 100644 +--- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -3327,7 +3595,7 @@ index 51a1be6760b3..49fff13a82bc 100644 FINAL_LIBRARY = "webrtc" -@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -3335,7 +3603,7 @@ index 51a1be6760b3..49fff13a82bc 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -3373,13 +3641,10 @@ index 51a1be6760b3..49fff13a82bc 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -3416,9 +3681,6 @@ index 51a1be6760b3..49fff13a82bc 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -3437,6 +3699,24 @@ index 51a1be6760b3..49fff13a82bc 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -3470,8 +3750,7 @@ index 51a1be6760b3..49fff13a82bc 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -3489,34 +3768,40 @@ index 51a1be6760b3..49fff13a82bc 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("audio_decoder_ilbc_gn") -diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build -index 198b82639e50..f01d64707d83 100644 ---- third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build -+++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("audio_encoder_g722_gn") +diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build +index 53e9d1a4a7ef..ada577bf55ee 100644 +--- third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -3525,7 +3810,7 @@ index 198b82639e50..f01d64707d83 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -3533,7 +3818,7 @@ index 198b82639e50..f01d64707d83 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -3543,6 +3828,10 @@ index 198b82639e50..f01d64707d83 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -3567,9 +3856,14 @@ index 198b82639e50..f01d64707d83 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -3604,6 +3898,13 @@ index 198b82639e50..f01d64707d83 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -3613,9 +3914,31 @@ index 198b82639e50..f01d64707d83 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -3650,6 +3973,10 @@ index 198b82639e50..f01d64707d83 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -3663,30 +3990,40 @@ index 198b82639e50..f01d64707d83 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("audio_encoder_ilbc_config_gn") -diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build -index 6b3377177c2b..b1cdc2e7f425 100644 ---- third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build -+++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("audio_decoder_ilbc_gn") +diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build +index 75737b8f19b0..008599051c34 100644 +--- third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -3695,7 +4032,7 @@ index 6b3377177c2b..b1cdc2e7f425 100644 FINAL_LIBRARY = "webrtc" -@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -3703,7 +4040,7 @@ index 6b3377177c2b..b1cdc2e7f425 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -3713,10 +4050,6 @@ index 6b3377177c2b..b1cdc2e7f425 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -3741,13 +4074,10 @@ index 6b3377177c2b..b1cdc2e7f425 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -3782,13 +4112,6 @@ index 6b3377177c2b..b1cdc2e7f425 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -3798,14 +4121,26 @@ index 6b3377177c2b..b1cdc2e7f425 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -3827,9 +4162,10 @@ index 6b3377177c2b..b1cdc2e7f425 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -3838,12 +4174,7 @@ index 6b3377177c2b..b1cdc2e7f425 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -3858,33 +4189,30 @@ index 6b3377177c2b..b1cdc2e7f425 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("audio_encoder_ilbc_gn") -diff --git third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn/moz.build third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn/moz.build -index 38ea6122bd04..130a501939c9 100644 ---- third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn/moz.build -+++ third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("audio_encoder_ilbc_config_gn") +diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build +index bddfe4219301..5d2f4376ee92 100644 +--- third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -3893,7 +4221,7 @@ index 38ea6122bd04..130a501939c9 100644 FINAL_LIBRARY = "webrtc" -@@ -40,151 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -3901,7 +4229,7 @@ index 38ea6122bd04..130a501939c9 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -3940,13 +4268,13 @@ index 38ea6122bd04..130a501939c9 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "m", - "rt" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -3995,6 +4323,34 @@ index 38ea6122bd04..130a501939c9 100644 DEFINES["WEBRTC_ARCH_ARM64"] = True DEFINES["WEBRTC_HAS_NEON"] = True +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -4019,9 +4375,15 @@ index 38ea6122bd04..130a501939c9 100644 - - DEFINES["USE_X11"] = "1" - +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -4034,37 +4396,45 @@ index 38ea6122bd04..130a501939c9 100644 - - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("audio_decoder_isac_float_gn") -diff --git third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn/moz.build third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn/moz.build -index f4a98698ec36..5f0d5d78d272 100644 ---- third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn/moz.build -+++ third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn/moz.build -@@ -11,10 +11,21 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("audio_encoder_ilbc_gn") +diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build +index 2b2bc6d9a7b7..fce4fdca7298 100644 +--- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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_USE_BUILTIN_ISAC_FIX"] = "0" -+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True @@ -4073,7 +4443,7 @@ index f4a98698ec36..5f0d5d78d272 100644 FINAL_LIBRARY = "webrtc" -@@ -36,207 +47,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -4081,7 +4451,7 @@ index f4a98698ec36..5f0d5d78d272 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -4099,8 +4469,6 @@ index f4a98698ec36..5f0d5d78d272 100644 - - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" - DEFINES["__STDC_CONSTANT_MACROS"] = True @@ -4121,18 +4489,13 @@ index f4a98698ec36..5f0d5d78d272 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True @@ -4147,8 +4510,6 @@ index f4a98698ec36..5f0d5d78d272 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -4168,9 +4529,6 @@ index f4a98698ec36..5f0d5d78d272 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -4182,20 +4540,31 @@ index f4a98698ec36..5f0d5d78d272 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "1" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "0" - --if CONFIG["CPU_ARCH"] == "ppc64": + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True - -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" +-if CONFIG["CPU_ARCH"] == "mips64": - -- OS_LIBS += [ -- "m" -- ] +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -4221,11 +4590,6 @@ index f4a98698ec36..5f0d5d78d272 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -4235,69 +4599,57 @@ index f4a98698ec36..5f0d5d78d272 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -- -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_GNU_SOURCE"] = True - -- OS_LIBS += [ -- "m" -- ] -- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -- DEFINES["_GNU_SOURCE"] = True -- -- OS_LIBS += [ -- "m" ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- -- OS_LIBS += [ -- "m" -- ] -- - Library("audio_decoder_isac_gn") -diff --git third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn/moz.build third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn/moz.build -index 6d73bbf414b9..3f239a6b1e48 100644 ---- third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn/moz.build -+++ third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("audio_decoder_multiopus_gn") +diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build +index e2c470d5ee58..0c7b461dd94a 100644 +--- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -4306,7 +4658,7 @@ index 6d73bbf414b9..3f239a6b1e48 100644 FINAL_LIBRARY = "webrtc" -@@ -40,151 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -4314,7 +4666,7 @@ index 6d73bbf414b9..3f239a6b1e48 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -4352,14 +4704,10 @@ index 6d73bbf414b9..3f239a6b1e48 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "m", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -4396,9 +4744,6 @@ index 6d73bbf414b9..3f239a6b1e48 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -4408,6 +4753,28 @@ index 6d73bbf414b9..3f239a6b1e48 100644 DEFINES["WEBRTC_ARCH_ARM64"] = True DEFINES["WEBRTC_HAS_NEON"] = True +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -4429,16 +4796,19 @@ index 6d73bbf414b9..3f239a6b1e48 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - -- DEFINES["USE_X11"] = "1" +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -4447,11 +4817,11 @@ index 6d73bbf414b9..3f239a6b1e48 100644 - - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - @@ -4459,25 +4829,24 @@ index 6d73bbf414b9..3f239a6b1e48 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("audio_encoder_isac_float_gn") -diff --git third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_gn/moz.build third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_gn/moz.build -index d5ee2a6ba2ed..ed7b32fe640c 100644 ---- third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_gn/moz.build -+++ third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_gn/moz.build -@@ -11,10 +11,21 @@ AllowCompilerWarnings() - + Library("audio_decoder_opus_config_gn") +diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build +index 58e6355a5568..c40633ff9ee4 100644 +--- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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_USE_BUILTIN_ISAC_FIX"] = "0" -+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True @@ -4486,7 +4855,7 @@ index d5ee2a6ba2ed..ed7b32fe640c 100644 FINAL_LIBRARY = "webrtc" -@@ -36,207 +47,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -4494,7 +4863,7 @@ index d5ee2a6ba2ed..ed7b32fe640c 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -4512,8 +4881,6 @@ index d5ee2a6ba2ed..ed7b32fe640c 100644 - - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" - DEFINES["__STDC_CONSTANT_MACROS"] = True @@ -4541,11 +4908,10 @@ index d5ee2a6ba2ed..ed7b32fe640c 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True @@ -4560,8 +4926,6 @@ index d5ee2a6ba2ed..ed7b32fe640c 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -4595,20 +4959,31 @@ index d5ee2a6ba2ed..ed7b32fe640c 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "1" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "0" - --if CONFIG["CPU_ARCH"] == "ppc64": + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True - -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" +-if CONFIG["CPU_ARCH"] == "mips64": - -- OS_LIBS += [ -- "m" -- ] +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -4634,11 +5009,6 @@ index d5ee2a6ba2ed..ed7b32fe640c 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -4648,69 +5018,57 @@ index d5ee2a6ba2ed..ed7b32fe640c 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -- -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_GNU_SOURCE"] = True - -- OS_LIBS += [ -- "m" -- ] -- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -- DEFINES["_GNU_SOURCE"] = True -- -- OS_LIBS += [ -- "m" ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- -- OS_LIBS += [ -- "m" -- ] -- - Library("audio_encoder_isac_gn") -diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build -index 54b4309abddb..75e7f69f5636 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("audio_decoder_opus_gn") +diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build +index 91afd0a4e40a..27167f6f4829 100644 +--- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -4719,7 +5077,7 @@ index 54b4309abddb..75e7f69f5636 100644 FINAL_LIBRARY = "webrtc" -@@ -41,164 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -4727,7 +5085,7 @@ index 54b4309abddb..75e7f69f5636 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -4768,6 +5126,7 @@ index 54b4309abddb..75e7f69f5636 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -4822,6 +5181,24 @@ index 54b4309abddb..75e7f69f5636 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -4856,10 +5233,10 @@ index 54b4309abddb..75e7f69f5636 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -4873,35 +5250,41 @@ index 54b4309abddb..75e7f69f5636 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 5d50deec5de3..14d82f743c17 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("audio_encoder_multiopus_gn") +diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build +index 06732b48f469..0ccb94d1f9fb 100644 +--- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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_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 @@ -4910,7 +5293,7 @@ index 5d50deec5de3..14d82f743c17 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -48,175 +57,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -4918,7 +5301,7 @@ index 5d50deec5de3..14d82f743c17 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -4955,6 +5338,7 @@ index 5d50deec5de3..14d82f743c17 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -4998,9 +5382,31 @@ index 5d50deec5de3..14d82f743c17 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -5035,6 +5441,10 @@ index 5d50deec5de3..14d82f743c17 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -5048,30 +5458,40 @@ index 5d50deec5de3..14d82f743c17 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 ff5dd08dc992..99f38d65b753 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("audio_encoder_opus_config_gn") +diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build +index ab84d3f7559f..e4bcd225837a 100644 +--- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -5080,7 +5500,7 @@ index ff5dd08dc992..99f38d65b753 100644 FINAL_LIBRARY = "webrtc" -@@ -41,171 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -5088,7 +5508,7 @@ index ff5dd08dc992..99f38d65b753 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -5133,6 +5553,7 @@ index ff5dd08dc992..99f38d65b753 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -5190,6 +5611,24 @@ index ff5dd08dc992..99f38d65b753 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -5223,8 +5662,7 @@ index ff5dd08dc992..99f38d65b753 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -5242,34 +5680,40 @@ index ff5dd08dc992..99f38d65b753 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 3516af523513..0e3c3096df4c 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("audio_encoder_opus_gn") +diff --git third_party/libwebrtc/api/audio_options_api_gn/moz.build third_party/libwebrtc/api/audio_options_api_gn/moz.build +index 1b19c42e986c..8d416085b79b 100644 +--- third_party/libwebrtc/api/audio_options_api_gn/moz.build ++++ third_party/libwebrtc/api/audio_options_api_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -5278,7 +5722,7 @@ index 3516af523513..0e3c3096df4c 100644 FINAL_LIBRARY = "webrtc" -@@ -41,164 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -5286,7 +5730,7 @@ index 3516af523513..0e3c3096df4c 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -5327,6 +5771,7 @@ index 3516af523513..0e3c3096df4c 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -5361,10 +5806,6 @@ index 3516af523513..0e3c3096df4c 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -5381,6 +5822,24 @@ index 3516af523513..0e3c3096df4c 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -5415,10 +5874,10 @@ index 3516af523513..0e3c3096df4c 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -5432,36 +5891,40 @@ index 3516af523513..0e3c3096df4c 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 43d7e5274368..065019e59374 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 -@@ -11,11 +11,20 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("audio_options_api_gn") +diff --git third_party/libwebrtc/api/bitrate_allocation_gn/moz.build third_party/libwebrtc/api/bitrate_allocation_gn/moz.build +index a694eff03b3f..953d60cc35a0 100644 +--- third_party/libwebrtc/api/bitrate_allocation_gn/moz.build ++++ third_party/libwebrtc/api/bitrate_allocation_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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_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 @@ -5470,7 +5933,7 @@ index 43d7e5274368..065019e59374 100644 FINAL_LIBRARY = "webrtc" -@@ -45,164 +54,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -5478,7 +5941,7 @@ index 43d7e5274368..065019e59374 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -5519,6 +5982,7 @@ index 43d7e5274368..065019e59374 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -5553,10 +6017,6 @@ index 43d7e5274368..065019e59374 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -5566,14 +6026,26 @@ index 43d7e5274368..065019e59374 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -5595,9 +6067,10 @@ index 43d7e5274368..065019e59374 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -5607,10 +6080,6 @@ index 43d7e5274368..065019e59374 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -5624,35 +6093,31 @@ index 43d7e5274368..065019e59374 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = 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 330a43703234..065955233aab 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("bitrate_allocation_gn") +diff --git third_party/libwebrtc/api/call_api_gn/moz.build third_party/libwebrtc/api/call_api_gn/moz.build +index e446d8228025..8b21859a8adb 100644 +--- third_party/libwebrtc/api/call_api_gn/moz.build ++++ third_party/libwebrtc/api/call_api_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -5661,7 +6126,7 @@ index 330a43703234..065955233aab 100644 FINAL_LIBRARY = "webrtc" -@@ -41,171 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -5669,7 +6134,7 @@ index 330a43703234..065955233aab 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -5679,10 +6144,6 @@ index 330a43703234..065955233aab 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -5707,13 +6168,10 @@ index 330a43703234..065955233aab 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -5748,13 +6206,6 @@ index 330a43703234..065955233aab 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -5764,14 +6215,26 @@ index 330a43703234..065955233aab 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -5793,9 +6256,10 @@ index 330a43703234..065955233aab 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -5804,12 +6268,7 @@ index 330a43703234..065955233aab 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -5824,33 +6283,30 @@ index 330a43703234..065955233aab 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("audio_encoder_opus_gn") -diff --git third_party/libwebrtc/api/audio_options_api_gn/moz.build third_party/libwebrtc/api/audio_options_api_gn/moz.build -index cc5b5eb5e4a9..c006b3531c8b 100644 ---- third_party/libwebrtc/api/audio_options_api_gn/moz.build -+++ third_party/libwebrtc/api/audio_options_api_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("call_api_gn") +diff --git third_party/libwebrtc/api/callfactory_api_gn/moz.build third_party/libwebrtc/api/callfactory_api_gn/moz.build +index b0f2bbbf3545..e51b0bd98f1a 100644 +--- third_party/libwebrtc/api/callfactory_api_gn/moz.build ++++ third_party/libwebrtc/api/callfactory_api_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -5859,7 +6315,7 @@ index cc5b5eb5e4a9..c006b3531c8b 100644 FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -5867,7 +6323,7 @@ index cc5b5eb5e4a9..c006b3531c8b 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -5905,9 +6361,14 @@ index cc5b5eb5e4a9..c006b3531c8b 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -5942,6 +6403,13 @@ index cc5b5eb5e4a9..c006b3531c8b 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -5951,14 +6419,26 @@ index cc5b5eb5e4a9..c006b3531c8b 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -5980,9 +6460,10 @@ index cc5b5eb5e4a9..c006b3531c8b 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -5991,12 +6472,7 @@ index cc5b5eb5e4a9..c006b3531c8b 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -6011,33 +6487,30 @@ index cc5b5eb5e4a9..c006b3531c8b 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = 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 380799a4aa02..5295e7882d87 100644 ---- third_party/libwebrtc/api/bitrate_allocation_gn/moz.build -+++ third_party/libwebrtc/api/bitrate_allocation_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("callfactory_api_gn") +diff --git third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build +index 1ce4cdd00a59..16ee32317d2a 100644 +--- third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build ++++ third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -6046,7 +6519,7 @@ index 380799a4aa02..5295e7882d87 100644 FINAL_LIBRARY = "webrtc" -@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -6054,7 +6527,7 @@ index 380799a4aa02..5295e7882d87 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -6095,6 +6568,7 @@ index 380799a4aa02..5295e7882d87 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -6142,176 +6616,22 @@ index 380799a4aa02..5295e7882d87 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" -- --if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -- -- OS_LIBS += [ -- "android_support" -- ] -- --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["CPU_ARCH"] == "mips64": - - 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 db4a54575138..2b8a2f5f9497 100644 ---- third_party/libwebrtc/api/call_api_gn/moz.build -+++ third_party/libwebrtc/api/call_api_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True -+DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["_FILE_OFFSET_BITS"] = "64" -+DEFINES["_LARGEFILE64_SOURCE"] = True -+DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True - FINAL_LIBRARY = "webrtc" - -@@ -36,144 +45,11 @@ 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"] = "r20_1" -- DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True -- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_AURA"] = "1" -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_NSS_CERTS"] = "1" -- DEFINES["USE_OZONE"] = "1" -- DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True -- DEFINES["NOMINMAX"] = True -- DEFINES["NTDDI_VERSION"] = "0x0A000000" -- DEFINES["PSAPI_VERSION"] = "2" -- DEFINES["UNICODE"] = True -- DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True -- DEFINES["WIN32"] = True -- DEFINES["WIN32_LEAN_AND_MEAN"] = True -- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" -- DEFINES["WINVER"] = "0x0A00" -- DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_RAND_S"] = True -- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True -- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True -- DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True -- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True -- DEFINES["_SECURE_ATL"] = True -- DEFINES["_UNICODE"] = True -- DEFINES["_WIN32_WINNT"] = "0x0A00" -- DEFINES["_WINDOWS"] = True -- DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True + if CONFIG["CPU_ARCH"] == "x86": - if CONFIG["CPU_ARCH"] == "aarch64": +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True + DEFINES["WEBRTC_ENABLE_AVX2"] = True --if CONFIG["CPU_ARCH"] == "arm": -- -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True -- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -6333,9 +6653,10 @@ index db4a54575138..2b8a2f5f9497 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -6365,23 +6686,24 @@ index db4a54575138..2b8a2f5f9497 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("call_api_gn") -diff --git third_party/libwebrtc/api/callfactory_api_gn/moz.build third_party/libwebrtc/api/callfactory_api_gn/moz.build -index 9f03f48d1987..a6853d8ca3f3 100644 ---- third_party/libwebrtc/api/callfactory_api_gn/moz.build -+++ third_party/libwebrtc/api/callfactory_api_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("frame_decryptor_interface_gn") +diff --git third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build +index b8385d1daacd..0ee97ec6c218 100644 +--- third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build ++++ third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -6390,7 +6712,7 @@ index 9f03f48d1987..a6853d8ca3f3 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -6398,7 +6720,7 @@ index 9f03f48d1987..a6853d8ca3f3 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -6408,6 +6730,10 @@ index 9f03f48d1987..a6853d8ca3f3 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -6435,6 +6761,7 @@ index 9f03f48d1987..a6853d8ca3f3 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -6482,6 +6809,22 @@ index 9f03f48d1987..a6853d8ca3f3 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -6503,9 +6846,10 @@ index 9f03f48d1987..a6853d8ca3f3 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -6535,23 +6879,24 @@ index 9f03f48d1987..a6853d8ca3f3 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("callfactory_api_gn") -diff --git third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build -index c8b24c40a820..2162f0030574 100644 ---- third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build -+++ third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("frame_encryptor_interface_gn") +diff --git third_party/libwebrtc/api/crypto/options_gn/moz.build third_party/libwebrtc/api/crypto/options_gn/moz.build +index aee1983c3e76..c6ad466bcf88 100644 +--- third_party/libwebrtc/api/crypto/options_gn/moz.build ++++ third_party/libwebrtc/api/crypto/options_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -6560,7 +6905,7 @@ index c8b24c40a820..2162f0030574 100644 FINAL_LIBRARY = "webrtc" -@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -6568,7 +6913,7 @@ index c8b24c40a820..2162f0030574 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -6578,10 +6923,6 @@ index c8b24c40a820..2162f0030574 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -6609,6 +6950,7 @@ index c8b24c40a820..2162f0030574 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -6652,9 +6994,31 @@ index c8b24c40a820..2162f0030574 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -6689,6 +7053,10 @@ index c8b24c40a820..2162f0030574 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -6702,30 +7070,40 @@ index c8b24c40a820..2162f0030574 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 cdd14e168edc..fae96897cdb4 100644 ---- third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build -+++ third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("options_gn") +diff --git third_party/libwebrtc/api/fec_controller_api_gn/moz.build third_party/libwebrtc/api/fec_controller_api_gn/moz.build +index 014e7fe571aa..0e340edaa9b8 100644 +--- third_party/libwebrtc/api/fec_controller_api_gn/moz.build ++++ third_party/libwebrtc/api/fec_controller_api_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -6734,7 +7112,7 @@ index cdd14e168edc..fae96897cdb4 100644 FINAL_LIBRARY = "webrtc" -@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -6742,7 +7120,7 @@ index cdd14e168edc..fae96897cdb4 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -6752,10 +7130,6 @@ index cdd14e168edc..fae96897cdb4 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -6783,6 +7157,7 @@ index cdd14e168edc..fae96897cdb4 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -6830,6 +7205,22 @@ index cdd14e168edc..fae96897cdb4 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -6851,9 +7242,10 @@ index cdd14e168edc..fae96897cdb4 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -6883,23 +7275,24 @@ index cdd14e168edc..fae96897cdb4 100644 - - 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 fe9930c25f0e..71c29972a147 100644 ---- third_party/libwebrtc/api/crypto/options_gn/moz.build -+++ third_party/libwebrtc/api/crypto/options_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + 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 4210c8af822d..bb3da46c855c 100644 +--- third_party/libwebrtc/api/field_trials_registry_gn/moz.build ++++ third_party/libwebrtc/api/field_trials_registry_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -6908,7 +7301,7 @@ index fe9930c25f0e..71c29972a147 100644 FINAL_LIBRARY = "webrtc" -@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -6916,7 +7309,7 @@ index fe9930c25f0e..71c29972a147 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -6927,7 +7320,6 @@ index fe9930c25f0e..71c29972a147 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -6955,14 +7347,10 @@ index fe9930c25f0e..71c29972a147 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -6997,13 +7385,6 @@ index fe9930c25f0e..71c29972a147 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -7021,184 +7402,23 @@ index fe9930c25f0e..71c29972a147 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" -- --if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] + if CONFIG["CPU_ARCH"] == "mips32": -- OS_LIBS += [ -- "android_support" -- ] -- --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": -- + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- -- CXXFLAGS += [ -- "-msse2" -- ] -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["CPU_ARCH"] == "mips64": - - DEFINES["_GNU_SOURCE"] = True -- - Library("options_gn") -diff --git third_party/libwebrtc/api/fec_controller_api_gn/moz.build third_party/libwebrtc/api/fec_controller_api_gn/moz.build -index f96ecb9b9e06..23bf32233d01 100644 ---- third_party/libwebrtc/api/fec_controller_api_gn/moz.build -+++ third_party/libwebrtc/api/fec_controller_api_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True -+DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["_FILE_OFFSET_BITS"] = "64" -+DEFINES["_LARGEFILE64_SOURCE"] = True -+DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True - - FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: - if CONFIG["MOZ_DEBUG"] == "1": + if CONFIG["CPU_ARCH"] == "x86": - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" -- --if CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" -- DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True -- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_AURA"] = "1" -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_NSS_CERTS"] = "1" -- DEFINES["USE_OZONE"] = "1" -- DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "OpenBSD": +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True -- DEFINES["NOMINMAX"] = True -- DEFINES["NTDDI_VERSION"] = "0x0A000000" -- DEFINES["PSAPI_VERSION"] = "2" -- DEFINES["UNICODE"] = True -- DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True -- DEFINES["WIN32"] = True -- DEFINES["WIN32_LEAN_AND_MEAN"] = True -- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" -- DEFINES["WINVER"] = "0x0A00" -- DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_RAND_S"] = True -- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True -- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True -- DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True -- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True -- DEFINES["_SECURE_ATL"] = True -- DEFINES["_UNICODE"] = True -- DEFINES["_WIN32_WINNT"] = "0x0A00" -- DEFINES["_WINDOWS"] = True -- DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": +-if CONFIG["CPU_ARCH"] == "x86_64": - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -7233,6 +7453,10 @@ index f96ecb9b9e06..23bf32233d01 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -7246,30 +7470,40 @@ index f96ecb9b9e06..23bf32233d01 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("fec_controller_api_gn") -diff --git third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build -index 9d7b8c54b3c6..775d63a4a19c 100644 ---- third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build -+++ third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 2c7f147d4afb..3078bdae753b 100644 +--- third_party/libwebrtc/api/field_trials_view_gn/moz.build ++++ third_party/libwebrtc/api/field_trials_view_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -7278,7 +7512,7 @@ index 9d7b8c54b3c6..775d63a4a19c 100644 FINAL_LIBRARY = "webrtc" -@@ -36,161 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -7286,7 +7520,7 @@ index 9d7b8c54b3c6..775d63a4a19c 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -7296,11 +7530,6 @@ index 9d7b8c54b3c6..775d63a4a19c 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "GLESv2", -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -7325,14 +7554,10 @@ index 9d7b8c54b3c6..775d63a4a19c 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -7367,13 +7592,6 @@ index 9d7b8c54b3c6..775d63a4a19c 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -7387,6 +7605,22 @@ index 9d7b8c54b3c6..775d63a4a19c 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -7408,9 +7642,10 @@ index 9d7b8c54b3c6..775d63a4a19c 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -7440,23 +7675,24 @@ index 9d7b8c54b3c6..775d63a4a19c 100644 - - DEFINES["_GNU_SOURCE"] = 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 35033d40cc4f..839899398612 100644 ---- third_party/libwebrtc/api/function_view_gn/moz.build -+++ third_party/libwebrtc/api/function_view_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("field_trials_view_gn") +diff --git third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build +index 885c8437ae88..43b4eeb1d4f0 100644 +--- third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build ++++ third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -7465,7 +7701,7 @@ index 35033d40cc4f..839899398612 100644 FINAL_LIBRARY = "webrtc" -@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -7473,7 +7709,7 @@ index 35033d40cc4f..839899398612 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -7511,9 +7747,14 @@ index 35033d40cc4f..839899398612 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -7548,6 +7789,13 @@ index 35033d40cc4f..839899398612 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -7561,176 +7809,22 @@ index 35033d40cc4f..839899398612 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" -- --if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -- -- OS_LIBS += [ -- "android_support" -- ] -- --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["CPU_ARCH"] == "mips64": - - 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 9c19d3a155dc..94741e262c65 100644 ---- third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build -+++ third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True -+DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["_FILE_OFFSET_BITS"] = "64" -+DEFINES["_LARGEFILE64_SOURCE"] = True -+DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True - - FINAL_LIBRARY = "webrtc" - -@@ -36,144 +45,11 @@ 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"] = "r20_1" -- DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True -- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_AURA"] = "1" -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_NSS_CERTS"] = "1" -- DEFINES["USE_OZONE"] = "1" -- DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True -- DEFINES["NOMINMAX"] = True -- DEFINES["NTDDI_VERSION"] = "0x0A000000" -- DEFINES["PSAPI_VERSION"] = "2" -- DEFINES["UNICODE"] = True -- DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True -- DEFINES["WIN32"] = True -- DEFINES["WIN32_LEAN_AND_MEAN"] = True -- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" -- DEFINES["WINVER"] = "0x0A00" -- DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_RAND_S"] = True -- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True -- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True -- DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True -- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True -- DEFINES["_SECURE_ATL"] = True -- DEFINES["_UNICODE"] = True -- DEFINES["_WIN32_WINNT"] = "0x0A00" -- DEFINES["_WINDOWS"] = True -- DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True + if CONFIG["CPU_ARCH"] == "x86": - if CONFIG["CPU_ARCH"] == "aarch64": +@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True + DEFINES["WEBRTC_ENABLE_AVX2"] = True --if CONFIG["CPU_ARCH"] == "arm": -- -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True -- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -7752,9 +7846,10 @@ index 9c19d3a155dc..94741e262c65 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -7784,23 +7879,24 @@ index 9c19d3a155dc..94741e262c65 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("jingle_logging_api_gn") -diff --git third_party/libwebrtc/api/media_stream_interface_gn/moz.build third_party/libwebrtc/api/media_stream_interface_gn/moz.build -index e515f1be307f..d0df42b36a1f 100644 ---- third_party/libwebrtc/api/media_stream_interface_gn/moz.build -+++ third_party/libwebrtc/api/media_stream_interface_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("frame_transformer_interface_gn") +diff --git third_party/libwebrtc/api/function_view_gn/moz.build third_party/libwebrtc/api/function_view_gn/moz.build +index 59ebc4ae7ad2..53144eed7f3b 100644 +--- third_party/libwebrtc/api/function_view_gn/moz.build ++++ third_party/libwebrtc/api/function_view_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -7809,7 +7905,7 @@ index e515f1be307f..d0df42b36a1f 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -7817,7 +7913,7 @@ index e515f1be307f..d0df42b36a1f 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -7858,6 +7954,7 @@ index e515f1be307f..d0df42b36a1f 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -7892,10 +7989,6 @@ index e515f1be307f..d0df42b36a1f 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -7905,14 +7998,26 @@ index e515f1be307f..d0df42b36a1f 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -7934,9 +8039,10 @@ index e515f1be307f..d0df42b36a1f 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -7946,10 +8052,6 @@ index e515f1be307f..d0df42b36a1f 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -7963,35 +8065,31 @@ index e515f1be307f..d0df42b36a1f 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("media_stream_interface_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 c96bd8795362..afbdad1f295a 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("function_view_gn") +diff --git third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build +index 5e41eca1b72c..a918a1104b37 100644 +--- third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build ++++ third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -8000,7 +8098,7 @@ index c96bd8795362..afbdad1f295a 100644 FINAL_LIBRARY = "webrtc" -@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -8008,7 +8106,7 @@ index c96bd8795362..afbdad1f295a 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -8018,10 +8116,6 @@ index c96bd8795362..afbdad1f295a 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -8046,13 +8140,10 @@ index c96bd8795362..afbdad1f295a 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -8087,13 +8178,6 @@ index c96bd8795362..afbdad1f295a 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -8103,14 +8187,26 @@ index c96bd8795362..afbdad1f295a 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -8132,9 +8228,10 @@ index c96bd8795362..afbdad1f295a 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -8143,12 +8240,7 @@ index c96bd8795362..afbdad1f295a 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -8163,33 +8255,30 @@ index c96bd8795362..afbdad1f295a 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("default_neteq_controller_factory_gn") -diff --git third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build -index a0b4c743fa36..29bdd8823259 100644 ---- third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build -+++ third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("jingle_logging_api_gn") +diff --git third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build +index 579b7f164b6a..bdbc0d078b7f 100644 +--- third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build ++++ third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -8198,7 +8287,7 @@ index a0b4c743fa36..29bdd8823259 100644 FINAL_LIBRARY = "webrtc" -@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -8206,7 +8295,7 @@ index a0b4c743fa36..29bdd8823259 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -8216,10 +8305,6 @@ index a0b4c743fa36..29bdd8823259 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -8244,13 +8329,10 @@ index a0b4c743fa36..29bdd8823259 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -8285,13 +8367,6 @@ index a0b4c743fa36..29bdd8823259 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -8301,14 +8376,26 @@ index a0b4c743fa36..29bdd8823259 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -8330,9 +8417,10 @@ index a0b4c743fa36..29bdd8823259 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -8341,12 +8429,7 @@ index a0b4c743fa36..29bdd8823259 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -8361,33 +8444,30 @@ index a0b4c743fa36..29bdd8823259 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = 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 1dcc194cb033..cc1685036edd 100644 ---- third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build -+++ third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("jingle_peerconnection_api_gn") +diff --git third_party/libwebrtc/api/make_ref_counted_gn/moz.build third_party/libwebrtc/api/make_ref_counted_gn/moz.build +index 8b3a500acb00..2565408ce87a 100644 +--- third_party/libwebrtc/api/make_ref_counted_gn/moz.build ++++ third_party/libwebrtc/api/make_ref_counted_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -8396,7 +8476,7 @@ index 1dcc194cb033..cc1685036edd 100644 FINAL_LIBRARY = "webrtc" -@@ -36,159 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -8404,7 +8484,7 @@ index 1dcc194cb033..cc1685036edd 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -8414,10 +8494,6 @@ index 1dcc194cb033..cc1685036edd 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -8442,13 +8518,10 @@ index 1dcc194cb033..cc1685036edd 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -8483,13 +8556,6 @@ index 1dcc194cb033..cc1685036edd 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -8503,6 +8569,22 @@ index 1dcc194cb033..cc1685036edd 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -8524,9 +8606,10 @@ index 1dcc194cb033..cc1685036edd 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -8556,23 +8639,24 @@ index 1dcc194cb033..cc1685036edd 100644 - - 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 c89b3bb7a411..82c7fbace17e 100644 ---- third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build -+++ third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("make_ref_counted_gn") +diff --git third_party/libwebrtc/api/media_stream_interface_gn/moz.build third_party/libwebrtc/api/media_stream_interface_gn/moz.build +index b80f10168f55..7aea55ea197a 100644 +--- third_party/libwebrtc/api/media_stream_interface_gn/moz.build ++++ third_party/libwebrtc/api/media_stream_interface_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -8581,7 +8665,7 @@ index c89b3bb7a411..82c7fbace17e 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -8589,7 +8673,7 @@ index c89b3bb7a411..82c7fbace17e 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -8630,6 +8714,7 @@ index c89b3bb7a411..82c7fbace17e 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -8684,6 +8769,24 @@ index c89b3bb7a411..82c7fbace17e 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -8718,10 +8821,10 @@ index c89b3bb7a411..82c7fbace17e 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -8735,35 +8838,40 @@ index c89b3bb7a411..82c7fbace17e 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 1e59d2afe971..2f6e23f32892 100644 ---- third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build -+++ third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 dce0ca43192e..9559599c7097 100644 +--- third_party/libwebrtc/api/metronome/metronome_gn/moz.build ++++ third_party/libwebrtc/api/metronome/metronome_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -8772,7 +8880,7 @@ index 1e59d2afe971..2f6e23f32892 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -8780,7 +8888,7 @@ index 1e59d2afe971..2f6e23f32892 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -8790,6 +8898,10 @@ index 1e59d2afe971..2f6e23f32892 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -8817,6 +8929,7 @@ index 1e59d2afe971..2f6e23f32892 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -8864,6 +8977,22 @@ index 1e59d2afe971..2f6e23f32892 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -8885,9 +9014,10 @@ index 1e59d2afe971..2f6e23f32892 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -8917,23 +9047,24 @@ index 1e59d2afe971..2f6e23f32892 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("network_state_predictor_api_gn") -diff --git third_party/libwebrtc/api/numerics/numerics_gn/moz.build third_party/libwebrtc/api/numerics/numerics_gn/moz.build -index 812e5cd6cdb5..1b4a93485bff 100644 ---- third_party/libwebrtc/api/numerics/numerics_gn/moz.build -+++ third_party/libwebrtc/api/numerics/numerics_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("metronome_gn") +diff --git third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build +index 273be80f73aa..3def73b6e920 100644 +--- third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build ++++ third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -8942,7 +9073,7 @@ index 812e5cd6cdb5..1b4a93485bff 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -8950,7 +9081,7 @@ index 812e5cd6cdb5..1b4a93485bff 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -8988,9 +9119,14 @@ index 812e5cd6cdb5..1b4a93485bff 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -9027,6 +9163,9 @@ index 812e5cd6cdb5..1b4a93485bff 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -9045,6 +9184,24 @@ index 812e5cd6cdb5..1b4a93485bff 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -9079,10 +9236,10 @@ index 812e5cd6cdb5..1b4a93485bff 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -9096,35 +9253,40 @@ index 812e5cd6cdb5..1b4a93485bff 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("numerics_gn") -diff --git third_party/libwebrtc/api/priority_gn/moz.build third_party/libwebrtc/api/priority_gn/moz.build -index 810e48354b06..6d7e125e5b0a 100644 ---- third_party/libwebrtc/api/priority_gn/moz.build -+++ third_party/libwebrtc/api/priority_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("default_neteq_controller_factory_gn") +diff --git third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build +index f06937f581eb..909633162ae6 100644 +--- third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build ++++ third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -9133,7 +9295,7 @@ index 810e48354b06..6d7e125e5b0a 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -9141,7 +9303,7 @@ index 810e48354b06..6d7e125e5b0a 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -9151,6 +9313,10 @@ index 810e48354b06..6d7e125e5b0a 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -9175,9 +9341,14 @@ index 810e48354b06..6d7e125e5b0a 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -9212,6 +9383,13 @@ index 810e48354b06..6d7e125e5b0a 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -9221,9 +9399,31 @@ index 810e48354b06..6d7e125e5b0a 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -9258,6 +9458,10 @@ index 810e48354b06..6d7e125e5b0a 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -9271,30 +9475,40 @@ index 810e48354b06..6d7e125e5b0a 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("priority_gn") -diff --git third_party/libwebrtc/api/refcountedbase_gn/moz.build third_party/libwebrtc/api/refcountedbase_gn/moz.build -index f2c7d0e1191c..5b4200b11d2a 100644 ---- third_party/libwebrtc/api/refcountedbase_gn/moz.build -+++ third_party/libwebrtc/api/refcountedbase_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("neteq_api_gn") +diff --git third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build +index d09b5aed5335..b63d342a355c 100644 +--- third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build ++++ third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -9303,7 +9517,7 @@ index f2c7d0e1191c..5b4200b11d2a 100644 FINAL_LIBRARY = "webrtc" -@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -9311,7 +9525,7 @@ index f2c7d0e1191c..5b4200b11d2a 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -9349,9 +9563,14 @@ index f2c7d0e1191c..5b4200b11d2a 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -9388,6 +9607,9 @@ index f2c7d0e1191c..5b4200b11d2a 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -9403,6 +9625,22 @@ index f2c7d0e1191c..5b4200b11d2a 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -9424,9 +9662,10 @@ index f2c7d0e1191c..5b4200b11d2a 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -9456,23 +9695,24 @@ index f2c7d0e1191c..5b4200b11d2a 100644 - - 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 a1ae01d70df0..a5b2ee75dbb5 100644 ---- third_party/libwebrtc/api/rtc_error_gn/moz.build -+++ third_party/libwebrtc/api/rtc_error_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("neteq_controller_api_gn") +diff --git third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build +index 012522550973..10f3a99bcbcd 100644 +--- third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build ++++ third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -9481,7 +9721,7 @@ index a1ae01d70df0..a5b2ee75dbb5 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -9489,7 +9729,7 @@ index a1ae01d70df0..a5b2ee75dbb5 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -9530,6 +9770,7 @@ index a1ae01d70df0..a5b2ee75dbb5 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -9564,10 +9805,6 @@ index a1ae01d70df0..a5b2ee75dbb5 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -9584,6 +9821,24 @@ index a1ae01d70df0..a5b2ee75dbb5 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -9618,10 +9873,10 @@ index a1ae01d70df0..a5b2ee75dbb5 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -9635,35 +9890,40 @@ index a1ae01d70df0..a5b2ee75dbb5 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 57ddf1efd92e..ed26491748a2 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("tick_timer_gn") +diff --git third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build +index 2a95233bda53..7f30532ddb95 100644 +--- third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build ++++ third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -9672,7 +9932,7 @@ index 57ddf1efd92e..ed26491748a2 100644 FINAL_LIBRARY = "webrtc" -@@ -41,164 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -9680,7 +9940,7 @@ index 57ddf1efd92e..ed26491748a2 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -9690,10 +9950,6 @@ index 57ddf1efd92e..ed26491748a2 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -9721,6 +9977,7 @@ index 57ddf1efd92e..ed26491748a2 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -9755,10 +10012,6 @@ index 57ddf1efd92e..ed26491748a2 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -9768,14 +10021,26 @@ index 57ddf1efd92e..ed26491748a2 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -9797,9 +10062,10 @@ index 57ddf1efd92e..ed26491748a2 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -9809,10 +10075,6 @@ index 57ddf1efd92e..ed26491748a2 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -9826,35 +10088,31 @@ index 57ddf1efd92e..ed26491748a2 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = 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 9f80ac1ca01b..ad758d6312d7 100644 ---- third_party/libwebrtc/api/rtp_headers_gn/moz.build -+++ third_party/libwebrtc/api/rtp_headers_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("network_state_predictor_api_gn") +diff --git third_party/libwebrtc/api/priority_gn/moz.build third_party/libwebrtc/api/priority_gn/moz.build +index 08cb5bf2d567..461d52f93d0e 100644 +--- third_party/libwebrtc/api/priority_gn/moz.build ++++ third_party/libwebrtc/api/priority_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -9863,7 +10121,7 @@ index 9f80ac1ca01b..ad758d6312d7 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -9871,7 +10129,7 @@ index 9f80ac1ca01b..ad758d6312d7 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -9881,10 +10139,6 @@ index 9f80ac1ca01b..ad758d6312d7 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -9912,6 +10166,7 @@ index 9f80ac1ca01b..ad758d6312d7 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -9946,10 +10201,6 @@ index 9f80ac1ca01b..ad758d6312d7 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -9959,14 +10210,26 @@ index 9f80ac1ca01b..ad758d6312d7 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -9988,9 +10251,10 @@ index 9f80ac1ca01b..ad758d6312d7 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -10000,10 +10264,6 @@ index 9f80ac1ca01b..ad758d6312d7 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -10017,35 +10277,31 @@ index 9f80ac1ca01b..ad758d6312d7 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = 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 52eaddda1b31..ec714a44a0df 100644 ---- third_party/libwebrtc/api/rtp_packet_info_gn/moz.build -+++ third_party/libwebrtc/api/rtp_packet_info_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("priority_gn") +diff --git third_party/libwebrtc/api/refcountedbase_gn/moz.build third_party/libwebrtc/api/refcountedbase_gn/moz.build +index f2a22be84640..b048864ad448 100644 +--- third_party/libwebrtc/api/refcountedbase_gn/moz.build ++++ third_party/libwebrtc/api/refcountedbase_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -10054,7 +10310,7 @@ index 52eaddda1b31..ec714a44a0df 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -10062,7 +10318,7 @@ index 52eaddda1b31..ec714a44a0df 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -10072,10 +10328,6 @@ index 52eaddda1b31..ec714a44a0df 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -10103,6 +10355,7 @@ index 52eaddda1b31..ec714a44a0df 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -10137,10 +10390,6 @@ index 52eaddda1b31..ec714a44a0df 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -10150,14 +10399,26 @@ index 52eaddda1b31..ec714a44a0df 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -10179,9 +10440,10 @@ index 52eaddda1b31..ec714a44a0df 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -10191,10 +10453,6 @@ index 52eaddda1b31..ec714a44a0df 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -10208,35 +10466,31 @@ index 52eaddda1b31..ec714a44a0df 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("rtp_packet_info_gn") -diff --git third_party/libwebrtc/api/rtp_parameters_gn/moz.build third_party/libwebrtc/api/rtp_parameters_gn/moz.build -index 2961df25af8d..261d8126e985 100644 ---- third_party/libwebrtc/api/rtp_parameters_gn/moz.build -+++ third_party/libwebrtc/api/rtp_parameters_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("refcountedbase_gn") +diff --git third_party/libwebrtc/api/rtc_error_gn/moz.build third_party/libwebrtc/api/rtc_error_gn/moz.build +index 07efa1cf5563..fcf285f401fc 100644 +--- third_party/libwebrtc/api/rtc_error_gn/moz.build ++++ third_party/libwebrtc/api/rtc_error_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -10245,7 +10499,7 @@ index 2961df25af8d..261d8126e985 100644 FINAL_LIBRARY = "webrtc" -@@ -41,160 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -10253,7 +10507,7 @@ index 2961df25af8d..261d8126e985 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -10294,6 +10548,7 @@ index 2961df25af8d..261d8126e985 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -10328,6 +10583,10 @@ index 2961df25af8d..261d8126e985 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -10344,6 +10603,24 @@ index 2961df25af8d..261d8126e985 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -10377,8 +10654,7 @@ index 2961df25af8d..261d8126e985 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -10396,34 +10672,40 @@ index 2961df25af8d..261d8126e985 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("rtp_parameters_gn") -diff --git third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build -index 286543e6b8d1..b737d063658d 100644 ---- third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build -+++ third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("rtc_error_gn") +diff --git third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build +index a96be6791fdc..68470ecf6df4 100644 +--- third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build ++++ third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -10432,7 +10714,7 @@ index 286543e6b8d1..b737d063658d 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -10440,7 +10722,7 @@ index 286543e6b8d1..b737d063658d 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -10450,6 +10732,10 @@ index 286543e6b8d1..b737d063658d 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -10477,6 +10763,7 @@ index 286543e6b8d1..b737d063658d 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -10511,6 +10798,10 @@ index 286543e6b8d1..b737d063658d 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -10520,9 +10811,31 @@ index 286543e6b8d1..b737d063658d 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -10557,6 +10870,10 @@ index 286543e6b8d1..b737d063658d 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -10570,30 +10887,40 @@ index 286543e6b8d1..b737d063658d 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 acf366b2f182..40fb2a99c76e 100644 ---- third_party/libwebrtc/api/scoped_refptr_gn/moz.build -+++ third_party/libwebrtc/api/scoped_refptr_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 d26fa6a026f9..b5647f419f7c 100644 +--- third_party/libwebrtc/api/rtp_headers_gn/moz.build ++++ third_party/libwebrtc/api/rtp_headers_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -10602,7 +10929,7 @@ index acf366b2f182..40fb2a99c76e 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -10610,7 +10937,7 @@ index acf366b2f182..40fb2a99c76e 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -10620,6 +10947,10 @@ index acf366b2f182..40fb2a99c76e 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -10647,6 +10978,7 @@ index acf366b2f182..40fb2a99c76e 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -10681,6 +11013,10 @@ index acf366b2f182..40fb2a99c76e 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -10690,9 +11026,31 @@ index acf366b2f182..40fb2a99c76e 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -10727,6 +11085,10 @@ index acf366b2f182..40fb2a99c76e 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -10740,30 +11102,40 @@ index acf366b2f182..40fb2a99c76e 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("scoped_refptr_gn") -diff --git third_party/libwebrtc/api/simulated_network_api_gn/moz.build third_party/libwebrtc/api/simulated_network_api_gn/moz.build -index cb130c31a398..019161c0ba01 100644 ---- third_party/libwebrtc/api/simulated_network_api_gn/moz.build -+++ third_party/libwebrtc/api/simulated_network_api_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("rtp_headers_gn") +diff --git third_party/libwebrtc/api/rtp_packet_info_gn/moz.build third_party/libwebrtc/api/rtp_packet_info_gn/moz.build +index 99c25cbbaead..df1cf58c7083 100644 +--- third_party/libwebrtc/api/rtp_packet_info_gn/moz.build ++++ third_party/libwebrtc/api/rtp_packet_info_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -10772,7 +11144,7 @@ index cb130c31a398..019161c0ba01 100644 FINAL_LIBRARY = "webrtc" -@@ -36,161 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -10780,7 +11152,7 @@ index cb130c31a398..019161c0ba01 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -10791,7 +11163,6 @@ index cb130c31a398..019161c0ba01 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -10819,14 +11190,10 @@ index cb130c31a398..019161c0ba01 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -10863,9 +11230,6 @@ index cb130c31a398..019161c0ba01 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -10877,9 +11241,31 @@ index cb130c31a398..019161c0ba01 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -10914,6 +11300,10 @@ index cb130c31a398..019161c0ba01 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -10927,30 +11317,40 @@ index cb130c31a398..019161c0ba01 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("simulated_network_api_gn") -diff --git third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build -index c67f147a275f..0c060438fc87 100644 ---- third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build -+++ third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("rtp_packet_info_gn") +diff --git third_party/libwebrtc/api/rtp_parameters_gn/moz.build third_party/libwebrtc/api/rtp_parameters_gn/moz.build +index 4dc6e4a74378..ddc2e7f5536f 100644 +--- third_party/libwebrtc/api/rtp_parameters_gn/moz.build ++++ third_party/libwebrtc/api/rtp_parameters_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -10959,7 +11359,7 @@ index c67f147a275f..0c060438fc87 100644 FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -10967,7 +11367,7 @@ index c67f147a275f..0c060438fc87 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -11008,6 +11408,7 @@ index c67f147a275f..0c060438fc87 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -11058,6 +11459,24 @@ index c67f147a275f..0c060438fc87 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -11091,8 +11510,7 @@ index c67f147a275f..0c060438fc87 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -11110,34 +11528,40 @@ index c67f147a275f..0c060438fc87 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("task_queue_gn") -diff --git third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build -index d775439d5ea1..dcd76fca3f37 100644 ---- third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build -+++ third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("rtp_parameters_gn") +diff --git third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build +index 9712e13ddd16..5f6e81fb3f4e 100644 +--- third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build ++++ third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -11146,7 +11570,7 @@ index d775439d5ea1..dcd76fca3f37 100644 FINAL_LIBRARY = "webrtc" -@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -11154,7 +11578,7 @@ index d775439d5ea1..dcd76fca3f37 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -11191,6 +11615,7 @@ index d775439d5ea1..dcd76fca3f37 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -11234,14 +11659,26 @@ index d775439d5ea1..dcd76fca3f37 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -11263,9 +11700,10 @@ index d775439d5ea1..dcd76fca3f37 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -11275,10 +11713,6 @@ index d775439d5ea1..dcd76fca3f37 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -11292,35 +11726,31 @@ index d775439d5ea1..dcd76fca3f37 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("bitrate_settings_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 bed9afdf2a01..bbfde1dfb32b 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("rtp_sender_interface_gn") +diff --git third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build +index 5cc94b1d99f7..f274d0055498 100644 +--- third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build ++++ third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -11329,7 +11759,7 @@ index bed9afdf2a01..bbfde1dfb32b 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -11337,7 +11767,7 @@ index bed9afdf2a01..bbfde1dfb32b 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -11378,6 +11808,7 @@ index bed9afdf2a01..bbfde1dfb32b 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -11432,6 +11863,24 @@ index bed9afdf2a01..bbfde1dfb32b 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -11466,10 +11915,10 @@ index bed9afdf2a01..bbfde1dfb32b 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -11483,35 +11932,40 @@ index bed9afdf2a01..bbfde1dfb32b 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("field_trial_based_config_gn") -diff --git third_party/libwebrtc/api/transport/goog_cc_gn/moz.build third_party/libwebrtc/api/transport/goog_cc_gn/moz.build -index 2989b81be163..aeccffe8f194 100644 ---- third_party/libwebrtc/api/transport/goog_cc_gn/moz.build -+++ third_party/libwebrtc/api/transport/goog_cc_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("rtp_sender_setparameters_callback_gn") +diff --git third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build +index 1ca9b4be66c4..a4bf4591450e 100644 +--- third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build ++++ third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -11520,7 +11974,7 @@ index 2989b81be163..aeccffe8f194 100644 FINAL_LIBRARY = "webrtc" -@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -11528,7 +11982,7 @@ index 2989b81be163..aeccffe8f194 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -11538,11 +11992,6 @@ index 2989b81be163..aeccffe8f194 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "GLESv2", -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -11567,14 +12016,10 @@ index 2989b81be163..aeccffe8f194 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -11609,13 +12054,6 @@ index 2989b81be163..aeccffe8f194 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -11625,14 +12063,26 @@ index 2989b81be163..aeccffe8f194 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -11654,9 +12104,10 @@ index 2989b81be163..aeccffe8f194 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -11665,12 +12116,7 @@ index 2989b81be163..aeccffe8f194 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -11685,33 +12131,30 @@ index 2989b81be163..aeccffe8f194 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = 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 deadc8ac83a6..a077649bb095 100644 ---- third_party/libwebrtc/api/transport/network_control_gn/moz.build -+++ third_party/libwebrtc/api/transport/network_control_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("rtp_transceiver_direction_gn") +diff --git third_party/libwebrtc/api/scoped_refptr_gn/moz.build third_party/libwebrtc/api/scoped_refptr_gn/moz.build +index d4dbda2c18f8..951e821afca9 100644 +--- third_party/libwebrtc/api/scoped_refptr_gn/moz.build ++++ third_party/libwebrtc/api/scoped_refptr_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -11720,7 +12163,7 @@ index deadc8ac83a6..a077649bb095 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -11728,7 +12171,7 @@ index deadc8ac83a6..a077649bb095 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -11738,10 +12181,6 @@ index deadc8ac83a6..a077649bb095 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -11769,6 +12208,7 @@ index deadc8ac83a6..a077649bb095 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -11803,10 +12243,6 @@ index deadc8ac83a6..a077649bb095 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -11816,14 +12252,26 @@ index deadc8ac83a6..a077649bb095 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -11845,9 +12293,10 @@ index deadc8ac83a6..a077649bb095 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -11857,10 +12306,6 @@ index deadc8ac83a6..a077649bb095 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -11874,35 +12319,31 @@ index deadc8ac83a6..a077649bb095 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("network_control_gn") -diff --git third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build -index c9744ca742b1..9763d1014c10 100644 ---- third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build -+++ third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("scoped_refptr_gn") +diff --git third_party/libwebrtc/api/sequence_checker_gn/moz.build third_party/libwebrtc/api/sequence_checker_gn/moz.build +index d3dd3980f86a..81e314ac9523 100644 +--- third_party/libwebrtc/api/sequence_checker_gn/moz.build ++++ third_party/libwebrtc/api/sequence_checker_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -11911,7 +12352,7 @@ index c9744ca742b1..9763d1014c10 100644 FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -11919,7 +12360,7 @@ index c9744ca742b1..9763d1014c10 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -11960,6 +12401,7 @@ index c9744ca742b1..9763d1014c10 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -12003,14 +12445,26 @@ index c9744ca742b1..9763d1014c10 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -12032,9 +12486,10 @@ index c9744ca742b1..9763d1014c10 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -12043,12 +12498,7 @@ index c9744ca742b1..9763d1014c10 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -12063,33 +12513,30 @@ index c9744ca742b1..9763d1014c10 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = 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 8357ef5ad627..1f8bb62c29f8 100644 ---- third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build -+++ third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("sequence_checker_gn") +diff --git third_party/libwebrtc/api/simulated_network_api_gn/moz.build third_party/libwebrtc/api/simulated_network_api_gn/moz.build +index 0867200479f4..04a99f0b12ea 100644 +--- third_party/libwebrtc/api/simulated_network_api_gn/moz.build ++++ third_party/libwebrtc/api/simulated_network_api_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -12098,7 +12545,7 @@ index 8357ef5ad627..1f8bb62c29f8 100644 FINAL_LIBRARY = "webrtc" -@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -12106,7 +12553,7 @@ index 8357ef5ad627..1f8bb62c29f8 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -12147,6 +12594,7 @@ index 8357ef5ad627..1f8bb62c29f8 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -12181,10 +12629,6 @@ index 8357ef5ad627..1f8bb62c29f8 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -12198,6 +12642,22 @@ index 8357ef5ad627..1f8bb62c29f8 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -12219,9 +12679,10 @@ index 8357ef5ad627..1f8bb62c29f8 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -12251,23 +12712,24 @@ index 8357ef5ad627..1f8bb62c29f8 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("rtp_source_gn") -diff --git third_party/libwebrtc/api/transport/webrtc_key_value_config_gn/moz.build third_party/libwebrtc/api/transport/webrtc_key_value_config_gn/moz.build -index 7c9e317da4a9..edcedf7243c2 100644 ---- third_party/libwebrtc/api/transport/webrtc_key_value_config_gn/moz.build -+++ third_party/libwebrtc/api/transport/webrtc_key_value_config_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("simulated_network_api_gn") +diff --git third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build +index d7e6a087fa00..ba1a6b109e0e 100644 +--- third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build ++++ third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -12276,7 +12738,7 @@ index 7c9e317da4a9..edcedf7243c2 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -12284,7 +12746,7 @@ index 7c9e317da4a9..edcedf7243c2 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -12294,6 +12756,10 @@ index 7c9e317da4a9..edcedf7243c2 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -12321,6 +12787,7 @@ index 7c9e317da4a9..edcedf7243c2 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -12364,9 +12831,31 @@ index 7c9e317da4a9..edcedf7243c2 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -12401,6 +12890,10 @@ index 7c9e317da4a9..edcedf7243c2 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -12414,30 +12907,40 @@ index 7c9e317da4a9..edcedf7243c2 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("webrtc_key_value_config_gn") -diff --git third_party/libwebrtc/api/transport_api_gn/moz.build third_party/libwebrtc/api/transport_api_gn/moz.build -index d82101ec94ab..cd3e8f4d4bdb 100644 ---- third_party/libwebrtc/api/transport_api_gn/moz.build -+++ third_party/libwebrtc/api/transport_api_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 c4d9c9d67d0a..7ff2201844db 100644 +--- third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build ++++ third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -12446,7 +12949,7 @@ index d82101ec94ab..cd3e8f4d4bdb 100644 FINAL_LIBRARY = "webrtc" -@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -12454,7 +12957,7 @@ index d82101ec94ab..cd3e8f4d4bdb 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -12464,6 +12967,10 @@ index d82101ec94ab..cd3e8f4d4bdb 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -12491,6 +12998,7 @@ index d82101ec94ab..cd3e8f4d4bdb 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -12541,6 +13049,24 @@ index d82101ec94ab..cd3e8f4d4bdb 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -12575,10 +13101,10 @@ index d82101ec94ab..cd3e8f4d4bdb 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -12592,35 +13118,40 @@ index d82101ec94ab..cd3e8f4d4bdb 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 db8dfa3e42cf..ef5a44fcdfd6 100644 ---- third_party/libwebrtc/api/units/data_rate_gn/moz.build -+++ third_party/libwebrtc/api/units/data_rate_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("task_queue_gn") +diff --git third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build +index fba5b45a5df7..39a9ebc0842e 100644 +--- third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build ++++ third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -12629,7 +13160,7 @@ index db8dfa3e42cf..ef5a44fcdfd6 100644 FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -12637,7 +13168,7 @@ index db8dfa3e42cf..ef5a44fcdfd6 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -12647,10 +13178,6 @@ index db8dfa3e42cf..ef5a44fcdfd6 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -12678,6 +13205,7 @@ index db8dfa3e42cf..ef5a44fcdfd6 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -12728,6 +13256,24 @@ index db8dfa3e42cf..ef5a44fcdfd6 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -12761,8 +13307,7 @@ index db8dfa3e42cf..ef5a44fcdfd6 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -12780,34 +13325,40 @@ index db8dfa3e42cf..ef5a44fcdfd6 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 97e1fb9ed783..ee495c9bdafb 100644 ---- third_party/libwebrtc/api/units/data_size_gn/moz.build -+++ third_party/libwebrtc/api/units/data_size_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 ac59bcbcde75..cbeb41795c2d 100644 +--- third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build ++++ third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -12816,7 +13367,7 @@ index 97e1fb9ed783..ee495c9bdafb 100644 FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -12824,7 +13375,7 @@ index 97e1fb9ed783..ee495c9bdafb 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -12865,6 +13416,7 @@ index 97e1fb9ed783..ee495c9bdafb 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -12899,6 +13451,10 @@ index 97e1fb9ed783..ee495c9bdafb 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -12908,14 +13464,26 @@ index 97e1fb9ed783..ee495c9bdafb 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -12937,9 +13505,10 @@ index 97e1fb9ed783..ee495c9bdafb 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -12948,12 +13517,7 @@ index 97e1fb9ed783..ee495c9bdafb 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -12968,33 +13532,30 @@ index 97e1fb9ed783..ee495c9bdafb 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = 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 b47ea78e3866..fb07644764ee 100644 ---- third_party/libwebrtc/api/units/frequency_gn/moz.build -+++ third_party/libwebrtc/api/units/frequency_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("datagram_transport_interface_gn") +diff --git third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build +index 1ef79b4d200b..e4486979adcc 100644 +--- third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build ++++ third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -13003,7 +13564,7 @@ index b47ea78e3866..fb07644764ee 100644 FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -13011,7 +13572,7 @@ index b47ea78e3866..fb07644764ee 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -13052,6 +13613,7 @@ index b47ea78e3866..fb07644764ee 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -13086,6 +13648,10 @@ index b47ea78e3866..fb07644764ee 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -13102,6 +13668,24 @@ index b47ea78e3866..fb07644764ee 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -13135,8 +13719,7 @@ index b47ea78e3866..fb07644764ee 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -13154,34 +13737,40 @@ index b47ea78e3866..fb07644764ee 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 cb171f6a7784..e02c37634041 100644 ---- third_party/libwebrtc/api/units/time_delta_gn/moz.build -+++ third_party/libwebrtc/api/units/time_delta_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + 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 95cbec37f017..dee377f35156 100644 +--- third_party/libwebrtc/api/transport/goog_cc_gn/moz.build ++++ third_party/libwebrtc/api/transport/goog_cc_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -13190,7 +13779,7 @@ index cb171f6a7784..e02c37634041 100644 FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -13198,7 +13787,7 @@ index cb171f6a7784..e02c37634041 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -13236,9 +13825,14 @@ index cb171f6a7784..e02c37634041 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -13273,6 +13867,13 @@ index cb171f6a7784..e02c37634041 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -13289,6 +13890,24 @@ index cb171f6a7784..e02c37634041 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -13322,8 +13941,7 @@ index cb171f6a7784..e02c37634041 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -13341,34 +13959,40 @@ index cb171f6a7784..e02c37634041 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 92f1144788f1..1fed6b8b7bcd 100644 ---- third_party/libwebrtc/api/units/timestamp_gn/moz.build -+++ third_party/libwebrtc/api/units/timestamp_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 181843597f7a..f03b20773145 100644 +--- third_party/libwebrtc/api/transport/network_control_gn/moz.build ++++ third_party/libwebrtc/api/transport/network_control_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -13377,7 +14001,7 @@ index 92f1144788f1..1fed6b8b7bcd 100644 FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -13385,7 +14009,7 @@ index 92f1144788f1..1fed6b8b7bcd 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -13426,6 +14050,7 @@ index 92f1144788f1..1fed6b8b7bcd 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -13460,6 +14085,10 @@ index 92f1144788f1..1fed6b8b7bcd 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -13476,6 +14105,24 @@ index 92f1144788f1..1fed6b8b7bcd 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -13509,8 +14156,7 @@ index 92f1144788f1..1fed6b8b7bcd 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -13528,34 +14174,40 @@ index 92f1144788f1..1fed6b8b7bcd 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 99a84f43d8f4..8aeba5d95cd1 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("network_control_gn") +diff --git third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build +index 0ee9e1fa1b7e..8c55ec075d15 100644 +--- third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build ++++ third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -13564,7 +14216,7 @@ index 99a84f43d8f4..8aeba5d95cd1 100644 FINAL_LIBRARY = "webrtc" -@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -13572,7 +14224,7 @@ index 99a84f43d8f4..8aeba5d95cd1 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -13583,7 +14235,6 @@ index 99a84f43d8f4..8aeba5d95cd1 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -13611,14 +14262,10 @@ index 99a84f43d8f4..8aeba5d95cd1 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -13653,13 +14300,6 @@ index 99a84f43d8f4..8aeba5d95cd1 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -13676,6 +14316,24 @@ index 99a84f43d8f4..8aeba5d95cd1 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -13709,8 +14367,7 @@ index 99a84f43d8f4..8aeba5d95cd1 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -13728,34 +14385,40 @@ index 99a84f43d8f4..8aeba5d95cd1 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("builtin_video_bitrate_allocator_factory_gn") -diff --git third_party/libwebrtc/api/video/encoded_frame_gn/moz.build third_party/libwebrtc/api/video/encoded_frame_gn/moz.build -index 8ce67d2b1c7c..291f44666f2e 100644 ---- third_party/libwebrtc/api/video/encoded_frame_gn/moz.build -+++ third_party/libwebrtc/api/video/encoded_frame_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 b43f4a77ec51..7862f9ee7c3d 100644 +--- third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build ++++ third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -13764,7 +14427,7 @@ index 8ce67d2b1c7c..291f44666f2e 100644 FINAL_LIBRARY = "webrtc" -@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -13772,7 +14435,7 @@ index 8ce67d2b1c7c..291f44666f2e 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -13783,7 +14446,6 @@ index 8ce67d2b1c7c..291f44666f2e 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -13811,14 +14473,10 @@ index 8ce67d2b1c7c..291f44666f2e 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -13855,9 +14513,6 @@ index 8ce67d2b1c7c..291f44666f2e 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -13869,14 +14524,26 @@ index 8ce67d2b1c7c..291f44666f2e 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -13898,9 +14565,10 @@ index 8ce67d2b1c7c..291f44666f2e 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -13909,12 +14577,7 @@ index 8ce67d2b1c7c..291f44666f2e 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -13929,33 +14592,30 @@ index 8ce67d2b1c7c..291f44666f2e 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = 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 badeb57ac51d..516b54f3a44a 100644 ---- third_party/libwebrtc/api/video/encoded_image_gn/moz.build -+++ third_party/libwebrtc/api/video/encoded_image_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("rtp_source_gn") +diff --git third_party/libwebrtc/api/transport/stun_types_gn/moz.build third_party/libwebrtc/api/transport/stun_types_gn/moz.build +index dd75da361bf7..39d0ef9756e1 100644 +--- third_party/libwebrtc/api/transport/stun_types_gn/moz.build ++++ third_party/libwebrtc/api/transport/stun_types_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -13964,7 +14624,7 @@ index badeb57ac51d..516b54f3a44a 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -13972,7 +14632,7 @@ index badeb57ac51d..516b54f3a44a 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -13982,10 +14642,6 @@ index badeb57ac51d..516b54f3a44a 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -14013,6 +14669,7 @@ index badeb57ac51d..516b54f3a44a 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -14047,10 +14704,6 @@ index badeb57ac51d..516b54f3a44a 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -14060,14 +14713,26 @@ index badeb57ac51d..516b54f3a44a 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -14089,9 +14754,10 @@ index badeb57ac51d..516b54f3a44a 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -14101,10 +14767,6 @@ index badeb57ac51d..516b54f3a44a 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -14118,35 +14780,31 @@ index badeb57ac51d..516b54f3a44a 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("encoded_image_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 52891f96afb5..f303ca6983c4 100644 ---- third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build -+++ third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("stun_types_gn") +diff --git third_party/libwebrtc/api/transport_api_gn/moz.build third_party/libwebrtc/api/transport_api_gn/moz.build +index 5335c2c5196b..98964899137c 100644 +--- third_party/libwebrtc/api/transport_api_gn/moz.build ++++ third_party/libwebrtc/api/transport_api_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -14155,7 +14813,7 @@ index 52891f96afb5..f303ca6983c4 100644 FINAL_LIBRARY = "webrtc" -@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -14163,7 +14821,7 @@ index 52891f96afb5..f303ca6983c4 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -14173,10 +14831,6 @@ index 52891f96afb5..f303ca6983c4 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -14204,6 +14858,7 @@ index 52891f96afb5..f303ca6983c4 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -14238,10 +14893,6 @@ index 52891f96afb5..f303ca6983c4 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -14251,9 +14902,31 @@ index 52891f96afb5..f303ca6983c4 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -14288,6 +14961,10 @@ index 52891f96afb5..f303ca6983c4 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -14301,30 +14978,40 @@ index 52891f96afb5..f303ca6983c4 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("recordable_encoded_frame_gn") -diff --git third_party/libwebrtc/api/video/video_adaptation_gn/moz.build third_party/libwebrtc/api/video/video_adaptation_gn/moz.build -index 54bb28f68e4c..f0cca879fa6b 100644 ---- third_party/libwebrtc/api/video/video_adaptation_gn/moz.build -+++ third_party/libwebrtc/api/video/video_adaptation_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 de76b8e11c82..710093b8259e 100644 +--- third_party/libwebrtc/api/units/data_rate_gn/moz.build ++++ third_party/libwebrtc/api/units/data_rate_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -14333,7 +15020,7 @@ index 54bb28f68e4c..f0cca879fa6b 100644 FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -14341,7 +15028,7 @@ index 54bb28f68e4c..f0cca879fa6b 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -14382,6 +15069,7 @@ index 54bb28f68e4c..f0cca879fa6b 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -14432,6 +15120,24 @@ index 54bb28f68e4c..f0cca879fa6b 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -14465,8 +15171,7 @@ index 54bb28f68e4c..f0cca879fa6b 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -14484,34 +15189,40 @@ index 54bb28f68e4c..f0cca879fa6b 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 392a6954e08d..2972c9dfc15e 100644 ---- third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build -+++ third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 dc54ce4f156e..ef4aba55e68f 100644 +--- third_party/libwebrtc/api/units/data_size_gn/moz.build ++++ third_party/libwebrtc/api/units/data_size_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -14520,7 +15231,7 @@ index 392a6954e08d..2972c9dfc15e 100644 FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -14528,7 +15239,7 @@ index 392a6954e08d..2972c9dfc15e 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -14569,6 +15280,7 @@ index 392a6954e08d..2972c9dfc15e 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -14619,6 +15331,24 @@ index 392a6954e08d..2972c9dfc15e 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -14652,8 +15382,7 @@ index 392a6954e08d..2972c9dfc15e 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -14671,34 +15400,40 @@ index 392a6954e08d..2972c9dfc15e 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 1db1b3f8dfc0..8832f25dcc93 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 3c84c283b8ec..07ce5ab7d03d 100644 +--- third_party/libwebrtc/api/units/frequency_gn/moz.build ++++ third_party/libwebrtc/api/units/frequency_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -14707,7 +15442,7 @@ index 1db1b3f8dfc0..8832f25dcc93 100644 FINAL_LIBRARY = "webrtc" -@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -14715,7 +15450,7 @@ index 1db1b3f8dfc0..8832f25dcc93 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -14756,6 +15491,7 @@ index 1db1b3f8dfc0..8832f25dcc93 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -14790,10 +15526,6 @@ index 1db1b3f8dfc0..8832f25dcc93 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -14803,9 +15535,31 @@ index 1db1b3f8dfc0..8832f25dcc93 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -14840,6 +15594,10 @@ index 1db1b3f8dfc0..8832f25dcc93 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -14853,30 +15611,40 @@ index 1db1b3f8dfc0..8832f25dcc93 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 93cb02b8c488..6b239028e2ff 100644 ---- third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build -+++ third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 3fe57620d83d..99beb9e82767 100644 +--- third_party/libwebrtc/api/units/time_delta_gn/moz.build ++++ third_party/libwebrtc/api/units/time_delta_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -14885,7 +15653,7 @@ index 93cb02b8c488..6b239028e2ff 100644 FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -14893,7 +15661,7 @@ index 93cb02b8c488..6b239028e2ff 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -14934,6 +15702,7 @@ index 93cb02b8c488..6b239028e2ff 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -14984,6 +15753,24 @@ index 93cb02b8c488..6b239028e2ff 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -15017,8 +15804,7 @@ index 93cb02b8c488..6b239028e2ff 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -15036,34 +15822,40 @@ index 93cb02b8c488..6b239028e2ff 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 842be7341fdc..fd7b28e14176 100644 ---- third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build -+++ third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("time_delta_gn") +diff --git third_party/libwebrtc/api/units/timestamp_gn/moz.build third_party/libwebrtc/api/units/timestamp_gn/moz.build +index a869cbcd713e..41f7f84b1527 100644 +--- third_party/libwebrtc/api/units/timestamp_gn/moz.build ++++ third_party/libwebrtc/api/units/timestamp_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -15072,7 +15864,7 @@ index 842be7341fdc..fd7b28e14176 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -15080,7 +15872,7 @@ index 842be7341fdc..fd7b28e14176 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -15090,6 +15882,10 @@ index 842be7341fdc..fd7b28e14176 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -15117,6 +15913,7 @@ index 842be7341fdc..fd7b28e14176 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -15160,9 +15957,31 @@ index 842be7341fdc..fd7b28e14176 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -15197,6 +16016,10 @@ index 842be7341fdc..fd7b28e14176 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -15210,30 +16033,40 @@ index 842be7341fdc..fd7b28e14176 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 3ed9af4e80a9..2918a04a155e 100644 ---- third_party/libwebrtc/api/video/video_frame_gn/moz.build -+++ third_party/libwebrtc/api/video/video_frame_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 40823f23553c..020bfc89b65a 100644 +--- third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build ++++ third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -15242,7 +16075,7 @@ index 3ed9af4e80a9..2918a04a155e 100644 FINAL_LIBRARY = "webrtc" -@@ -42,164 +51,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -15250,7 +16083,7 @@ index 3ed9af4e80a9..2918a04a155e 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -15261,6 +16094,7 @@ index 3ed9af4e80a9..2918a04a155e 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ +- "GLESv2", - "log" - ] - @@ -15288,9 +16122,14 @@ index 3ed9af4e80a9..2918a04a155e 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -15327,6 +16166,9 @@ index 3ed9af4e80a9..2918a04a155e 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -15345,6 +16187,24 @@ index 3ed9af4e80a9..2918a04a155e 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -15379,10 +16239,10 @@ index 3ed9af4e80a9..2918a04a155e 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -15396,35 +16256,40 @@ index 3ed9af4e80a9..2918a04a155e 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 f5e98b8bdad6..35d3ffb7bfd4 100644 ---- third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build -+++ third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("builtin_video_bitrate_allocator_factory_gn") +diff --git third_party/libwebrtc/api/video/encoded_frame_gn/moz.build third_party/libwebrtc/api/video/encoded_frame_gn/moz.build +index f5aee8c8e896..d43142211cf9 100644 +--- third_party/libwebrtc/api/video/encoded_frame_gn/moz.build ++++ third_party/libwebrtc/api/video/encoded_frame_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -15433,7 +16298,7 @@ index f5e98b8bdad6..35d3ffb7bfd4 100644 FINAL_LIBRARY = "webrtc" -@@ -42,173 +51,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -15441,7 +16306,7 @@ index f5e98b8bdad6..35d3ffb7bfd4 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -15452,7 +16317,6 @@ index f5e98b8bdad6..35d3ffb7bfd4 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -15481,13 +16345,13 @@ index f5e98b8bdad6..35d3ffb7bfd4 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -15545,6 +16409,24 @@ index f5e98b8bdad6..35d3ffb7bfd4 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -15578,8 +16460,7 @@ index f5e98b8bdad6..35d3ffb7bfd4 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -15597,34 +16478,40 @@ index f5e98b8bdad6..35d3ffb7bfd4 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("video_frame_i010_gn") -diff --git third_party/libwebrtc/api/video/video_frame_i420_gn/moz.build third_party/libwebrtc/api/video/video_frame_i420_gn/moz.build -index daadd37570ae..08efda34e742 100644 ---- third_party/libwebrtc/api/video/video_frame_i420_gn/moz.build -+++ third_party/libwebrtc/api/video/video_frame_i420_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 aebcf21b3767..4c046aa480ac 100644 +--- third_party/libwebrtc/api/video/encoded_image_gn/moz.build ++++ third_party/libwebrtc/api/video/encoded_image_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -15633,7 +16520,7 @@ index daadd37570ae..08efda34e742 100644 FINAL_LIBRARY = "webrtc" -@@ -42,173 +51,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -15641,7 +16528,7 @@ index daadd37570ae..08efda34e742 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -15652,7 +16539,6 @@ index daadd37570ae..08efda34e742 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -15680,14 +16566,10 @@ index daadd37570ae..08efda34e742 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -15724,9 +16606,6 @@ index daadd37570ae..08efda34e742 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -15745,6 +16624,24 @@ index daadd37570ae..08efda34e742 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -15778,8 +16675,7 @@ index daadd37570ae..08efda34e742 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -15797,34 +16693,40 @@ index daadd37570ae..08efda34e742 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("video_frame_i420_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 09771a194381..c3ad804c51e7 100644 ---- third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build -+++ third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 b4c504524c6f..ea11fb826b9e 100644 +--- third_party/libwebrtc/api/video/frame_buffer_gn/moz.build ++++ third_party/libwebrtc/api/video/frame_buffer_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -15833,7 +16735,7 @@ index 09771a194381..c3ad804c51e7 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -15841,7 +16743,7 @@ index 09771a194381..c3ad804c51e7 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -15879,9 +16781,14 @@ index 09771a194381..c3ad804c51e7 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -15918,6 +16825,9 @@ index 09771a194381..c3ad804c51e7 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -15936,6 +16846,24 @@ index 09771a194381..c3ad804c51e7 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -15970,10 +16898,10 @@ index 09771a194381..c3ad804c51e7 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -15987,35 +16915,40 @@ index 09771a194381..c3ad804c51e7 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("video_frame_metadata_gn") -diff --git third_party/libwebrtc/api/video/video_frame_nv12_gn/moz.build third_party/libwebrtc/api/video/video_frame_nv12_gn/moz.build -index c4a0e99b1a67..417a46ea6bf2 100644 ---- third_party/libwebrtc/api/video/video_frame_nv12_gn/moz.build -+++ third_party/libwebrtc/api/video/video_frame_nv12_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("frame_buffer_gn") +diff --git third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build +index af294ef3ca63..63707a6269b2 100644 +--- third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build ++++ third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -16024,7 +16957,7 @@ index c4a0e99b1a67..417a46ea6bf2 100644 FINAL_LIBRARY = "webrtc" -@@ -42,173 +51,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -16032,7 +16965,7 @@ index c4a0e99b1a67..417a46ea6bf2 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -16043,7 +16976,6 @@ index c4a0e99b1a67..417a46ea6bf2 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -16071,14 +17003,10 @@ index c4a0e99b1a67..417a46ea6bf2 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -16115,9 +17043,6 @@ index c4a0e99b1a67..417a46ea6bf2 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -16129,14 +17054,26 @@ index c4a0e99b1a67..417a46ea6bf2 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -16158,9 +17095,10 @@ index c4a0e99b1a67..417a46ea6bf2 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -16169,12 +17107,7 @@ index c4a0e99b1a67..417a46ea6bf2 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -16189,33 +17122,30 @@ index c4a0e99b1a67..417a46ea6bf2 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("video_frame_nv12_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 322b31eae189..9f264c4d4d31 100644 ---- third_party/libwebrtc/api/video/video_frame_type_gn/moz.build -+++ third_party/libwebrtc/api/video/video_frame_type_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("recordable_encoded_frame_gn") +diff --git third_party/libwebrtc/api/video/render_resolution_gn/moz.build third_party/libwebrtc/api/video/render_resolution_gn/moz.build +index 5f97a983f82e..abe0dea08303 100644 +--- third_party/libwebrtc/api/video/render_resolution_gn/moz.build ++++ third_party/libwebrtc/api/video/render_resolution_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -16224,7 +17154,7 @@ index 322b31eae189..9f264c4d4d31 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -16232,7 +17162,7 @@ index 322b31eae189..9f264c4d4d31 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -16269,6 +17199,7 @@ index 322b31eae189..9f264c4d4d31 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -16316,6 +17247,22 @@ index 322b31eae189..9f264c4d4d31 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -16337,9 +17284,10 @@ index 322b31eae189..9f264c4d4d31 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -16369,23 +17317,24 @@ index 322b31eae189..9f264c4d4d31 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("video_frame_type_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 6d9bfe052a35..655b55aced32 100644 ---- third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build -+++ third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("render_resolution_gn") +diff --git third_party/libwebrtc/api/video/resolution_gn/moz.build third_party/libwebrtc/api/video/resolution_gn/moz.build +index deafa478ddb9..10bf77256f20 100644 +--- third_party/libwebrtc/api/video/resolution_gn/moz.build ++++ third_party/libwebrtc/api/video/resolution_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -16394,7 +17343,7 @@ index 6d9bfe052a35..655b55aced32 100644 FINAL_LIBRARY = "webrtc" -@@ -43,164 +52,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -16402,7 +17351,7 @@ index 6d9bfe052a35..655b55aced32 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -16412,10 +17361,6 @@ index 6d9bfe052a35..655b55aced32 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -16443,6 +17388,7 @@ index 6d9bfe052a35..655b55aced32 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -16477,10 +17423,6 @@ index 6d9bfe052a35..655b55aced32 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -16490,14 +17432,26 @@ index 6d9bfe052a35..655b55aced32 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -16519,9 +17473,10 @@ index 6d9bfe052a35..655b55aced32 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -16531,10 +17486,6 @@ index 6d9bfe052a35..655b55aced32 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -16548,35 +17499,31 @@ index 6d9bfe052a35..655b55aced32 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("video_rtp_headers_gn") -diff --git third_party/libwebrtc/api/video/video_stream_encoder_create_gn/moz.build third_party/libwebrtc/api/video/video_stream_encoder_create_gn/moz.build -index f8ab62cc73d0..38b76b381ae2 100644 ---- third_party/libwebrtc/api/video/video_stream_encoder_create_gn/moz.build -+++ third_party/libwebrtc/api/video/video_stream_encoder_create_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("resolution_gn") +diff --git third_party/libwebrtc/api/video/video_adaptation_gn/moz.build third_party/libwebrtc/api/video/video_adaptation_gn/moz.build +index 3b4495f26c0c..cd0d8268f411 100644 +--- third_party/libwebrtc/api/video/video_adaptation_gn/moz.build ++++ third_party/libwebrtc/api/video/video_adaptation_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -16585,7 +17532,7 @@ index f8ab62cc73d0..38b76b381ae2 100644 FINAL_LIBRARY = "webrtc" -@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -16593,7 +17540,7 @@ index f8ab62cc73d0..38b76b381ae2 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -16604,7 +17551,6 @@ index f8ab62cc73d0..38b76b381ae2 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -16632,14 +17578,10 @@ index f8ab62cc73d0..38b76b381ae2 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -16674,13 +17616,6 @@ index f8ab62cc73d0..38b76b381ae2 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -16697,6 +17632,24 @@ index f8ab62cc73d0..38b76b381ae2 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -16730,8 +17683,7 @@ index f8ab62cc73d0..38b76b381ae2 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -16749,34 +17701,40 @@ index f8ab62cc73d0..38b76b381ae2 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("video_stream_encoder_create_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 5b023d8dfbbf..8b2ed3f32f47 100644 ---- third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build -+++ third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 2c7b1f39e7c2..b2366c6af2a0 100644 +--- third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build ++++ third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -16785,7 +17743,7 @@ index 5b023d8dfbbf..8b2ed3f32f47 100644 FINAL_LIBRARY = "webrtc" -@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -16793,7 +17751,7 @@ index 5b023d8dfbbf..8b2ed3f32f47 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -16834,6 +17792,7 @@ index 5b023d8dfbbf..8b2ed3f32f47 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -16868,10 +17827,6 @@ index 5b023d8dfbbf..8b2ed3f32f47 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -16881,9 +17836,31 @@ index 5b023d8dfbbf..8b2ed3f32f47 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -16918,6 +17895,10 @@ index 5b023d8dfbbf..8b2ed3f32f47 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -16931,30 +17912,40 @@ index 5b023d8dfbbf..8b2ed3f32f47 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 4a0aaf1f6240..bb85facf1bc4 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 a6e2e2c6f5a9..8eb8884fe45b 100644 +--- third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build ++++ third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -16963,7 +17954,7 @@ index 4a0aaf1f6240..bb85facf1bc4 100644 FINAL_LIBRARY = "webrtc" -@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -16971,7 +17962,7 @@ index 4a0aaf1f6240..bb85facf1bc4 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -17012,6 +18003,7 @@ index 4a0aaf1f6240..bb85facf1bc4 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -17046,6 +18038,10 @@ index 4a0aaf1f6240..bb85facf1bc4 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -17059,6 +18055,22 @@ index 4a0aaf1f6240..bb85facf1bc4 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -17080,9 +18092,10 @@ index 4a0aaf1f6240..bb85facf1bc4 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -17112,23 +18125,24 @@ index 4a0aaf1f6240..bb85facf1bc4 100644 - - 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 37bdbe867041..f9d83c4b05b2 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("video_bitrate_allocator_factory_gn") +diff --git third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build +index f09476aacb87..7f6b2b8a30ac 100644 +--- third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build ++++ third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -17137,7 +18151,7 @@ index 37bdbe867041..f9d83c4b05b2 100644 FINAL_LIBRARY = "webrtc" -@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -17145,7 +18159,7 @@ index 37bdbe867041..f9d83c4b05b2 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -17156,7 +18170,6 @@ index 37bdbe867041..f9d83c4b05b2 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -17184,14 +18197,10 @@ index 37bdbe867041..f9d83c4b05b2 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -17226,13 +18235,6 @@ index 37bdbe867041..f9d83c4b05b2 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -17249,6 +18251,24 @@ index 37bdbe867041..f9d83c4b05b2 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -17282,8 +18302,7 @@ index 37bdbe867041..f9d83c4b05b2 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -17301,34 +18320,40 @@ index 37bdbe867041..f9d83c4b05b2 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("builtin_video_decoder_factory_gn") -diff --git third_party/libwebrtc/api/video_codecs/builtin_video_encoder_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/builtin_video_encoder_factory_gn/moz.build -index 63d7916f587b..f0603023db5e 100644 ---- third_party/libwebrtc/api/video_codecs/builtin_video_encoder_factory_gn/moz.build -+++ third_party/libwebrtc/api/video_codecs/builtin_video_encoder_factory_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("video_bitrate_allocator_gn") +diff --git third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build +index 2ac72c5b5429..b7f4cc420178 100644 +--- third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build ++++ third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -17337,7 +18362,7 @@ index 63d7916f587b..f0603023db5e 100644 FINAL_LIBRARY = "webrtc" -@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -17345,7 +18370,7 @@ index 63d7916f587b..f0603023db5e 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -17355,11 +18380,6 @@ index 63d7916f587b..f0603023db5e 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "GLESv2", -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -17384,14 +18404,10 @@ index 63d7916f587b..f0603023db5e 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -17426,13 +18442,6 @@ index 63d7916f587b..f0603023db5e 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -17442,14 +18451,26 @@ index 63d7916f587b..f0603023db5e 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -17471,9 +18492,10 @@ index 63d7916f587b..f0603023db5e 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -17482,12 +18504,7 @@ index 63d7916f587b..f0603023db5e 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -17502,33 +18519,30 @@ index 63d7916f587b..f0603023db5e 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("builtin_video_encoder_factory_gn") -diff --git third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build -index f3acda93c586..354e52e878af 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("video_codec_constants_gn") +diff --git third_party/libwebrtc/api/video/video_frame_gn/moz.build third_party/libwebrtc/api/video/video_frame_gn/moz.build +index 7a4e9fdc2c33..c7700a5bcd92 100644 +--- third_party/libwebrtc/api/video/video_frame_gn/moz.build ++++ third_party/libwebrtc/api/video/video_frame_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -17537,7 +18551,7 @@ index f3acda93c586..354e52e878af 100644 FINAL_LIBRARY = "webrtc" -@@ -41,173 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -54,183 +63,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -17545,7 +18559,7 @@ index f3acda93c586..354e52e878af 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -17556,7 +18570,6 @@ index f3acda93c586..354e52e878af 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -17584,14 +18597,10 @@ index f3acda93c586..354e52e878af 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -17628,9 +18637,6 @@ index f3acda93c586..354e52e878af 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -17649,6 +18655,24 @@ index f3acda93c586..354e52e878af 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -17682,8 +18706,7 @@ index f3acda93c586..354e52e878af 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -17701,34 +18724,40 @@ index f3acda93c586..354e52e878af 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("rtc_software_fallback_wrappers_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 cbde20ed59d5..ee169dd583a0 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("video_frame_gn") +diff --git third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build +index e56d43a29930..735fd52d03b8 100644 +--- third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build ++++ third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -17737,7 +18766,7 @@ index cbde20ed59d5..ee169dd583a0 100644 FINAL_LIBRARY = "webrtc" -@@ -48,164 +57,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -50,183 +59,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -17745,7 +18774,7 @@ index cbde20ed59d5..ee169dd583a0 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -17786,6 +18815,7 @@ index cbde20ed59d5..ee169dd583a0 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -17840,6 +18870,24 @@ index cbde20ed59d5..ee169dd583a0 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -17874,10 +18922,10 @@ index cbde20ed59d5..ee169dd583a0 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -17891,35 +18939,40 @@ index cbde20ed59d5..ee169dd583a0 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("video_codecs_api_gn") -diff --git third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build -index b2397b024133..4a77d9ee6f62 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("video_frame_i010_gn") +diff --git third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build +index 2d2221dbb57d..eb03efadbe9a 100644 +--- third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build ++++ third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -17928,7 +18981,7 @@ index b2397b024133..4a77d9ee6f62 100644 FINAL_LIBRARY = "webrtc" -@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -17936,7 +18989,7 @@ index b2397b024133..4a77d9ee6f62 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -17947,7 +19000,6 @@ index b2397b024133..4a77d9ee6f62 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -17975,14 +19027,10 @@ index b2397b024133..4a77d9ee6f62 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -18019,9 +19067,6 @@ index b2397b024133..4a77d9ee6f62 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -18040,6 +19085,24 @@ index b2397b024133..4a77d9ee6f62 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -18073,8 +19136,7 @@ index b2397b024133..4a77d9ee6f62 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -18092,34 +19154,40 @@ index b2397b024133..4a77d9ee6f62 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("vp8_temporal_layers_factory_gn") -diff --git third_party/libwebrtc/audio/audio_gn/moz.build third_party/libwebrtc/audio/audio_gn/moz.build -index ffa016f36790..a613258bd36d 100644 ---- third_party/libwebrtc/audio/audio_gn/moz.build -+++ third_party/libwebrtc/audio/audio_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 bc4c46bfbdc5..7b04b10d4157 100644 +--- third_party/libwebrtc/api/video/video_frame_type_gn/moz.build ++++ third_party/libwebrtc/api/video/video_frame_type_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -18128,7 +19196,7 @@ index ffa016f36790..a613258bd36d 100644 FINAL_LIBRARY = "webrtc" -@@ -53,173 +62,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -18136,7 +19204,7 @@ index ffa016f36790..a613258bd36d 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -18146,11 +19214,6 @@ index ffa016f36790..a613258bd36d 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "GLESv2", -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -18175,14 +19238,10 @@ index ffa016f36790..a613258bd36d 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -18217,13 +19276,6 @@ index ffa016f36790..a613258bd36d 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -18233,14 +19285,26 @@ index ffa016f36790..a613258bd36d 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -18262,9 +19326,10 @@ index ffa016f36790..a613258bd36d 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -18273,12 +19338,7 @@ index ffa016f36790..a613258bd36d 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -18293,33 +19353,30 @@ index ffa016f36790..a613258bd36d 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("audio_gn") -diff --git third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build -index d135fbce0b2f..0163aafa277f 100644 ---- third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build -+++ third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("video_frame_type_gn") +diff --git third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build +index ded4d37ab6b7..0129e1ce4ed0 100644 +--- third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build ++++ third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -18328,7 +19385,7 @@ index d135fbce0b2f..0163aafa277f 100644 FINAL_LIBRARY = "webrtc" -@@ -42,171 +51,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -18336,7 +19393,7 @@ index d135fbce0b2f..0163aafa277f 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -18374,13 +19431,10 @@ index d135fbce0b2f..0163aafa277f 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -18415,13 +19469,6 @@ index d135fbce0b2f..0163aafa277f 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -18431,14 +19478,26 @@ index d135fbce0b2f..0163aafa277f 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -18460,9 +19519,10 @@ index d135fbce0b2f..0163aafa277f 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -18471,12 +19531,7 @@ index d135fbce0b2f..0163aafa277f 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -18491,33 +19546,30 @@ index d135fbce0b2f..0163aafa277f 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("audio_frame_operations_gn") -diff --git third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build -index 42be32b5f175..ce11b5528019 100644 ---- third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build -+++ third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("video_layers_allocation_gn") +diff --git third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build +index fffe252ebd5c..1bdba7c6dffa 100644 +--- third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build ++++ third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -18526,7 +19578,7 @@ index 42be32b5f175..ce11b5528019 100644 FINAL_LIBRARY = "webrtc" -@@ -49,173 +58,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,183 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -18534,7 +19586,7 @@ index 42be32b5f175..ce11b5528019 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -18545,7 +19597,6 @@ index 42be32b5f175..ce11b5528019 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -18573,14 +19624,10 @@ index 42be32b5f175..ce11b5528019 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -18617,9 +19664,6 @@ index 42be32b5f175..ce11b5528019 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -18638,6 +19682,24 @@ index 42be32b5f175..ce11b5528019 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -18671,8 +19733,7 @@ index 42be32b5f175..ce11b5528019 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -18690,34 +19751,40 @@ index 42be32b5f175..ce11b5528019 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("resource_adaptation_gn") -diff --git third_party/libwebrtc/call/audio_sender_interface_gn/moz.build third_party/libwebrtc/call/audio_sender_interface_gn/moz.build -index c72f46fb3f66..f1bfc8428161 100644 ---- third_party/libwebrtc/call/audio_sender_interface_gn/moz.build -+++ third_party/libwebrtc/call/audio_sender_interface_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 e36bc0df9828..cb189ba6fbb8 100644 +--- third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build ++++ third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -18726,7 +19793,7 @@ index c72f46fb3f66..f1bfc8428161 100644 FINAL_LIBRARY = "webrtc" -@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -18734,7 +19801,7 @@ index c72f46fb3f66..f1bfc8428161 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -18775,6 +19842,7 @@ index c72f46fb3f66..f1bfc8428161 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -18826,6 +19894,22 @@ index c72f46fb3f66..f1bfc8428161 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -18847,9 +19931,203 @@ index c72f46fb3f66..f1bfc8428161 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- + Library("video_stream_encoder_gn") +diff --git third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build +index dcf5d2273c8d..86180d10a821 100644 +--- third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build ++++ third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -18879,23 +20157,24 @@ index c72f46fb3f66..f1bfc8428161 100644 - - 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 ce93a0952f60..b5b26a5563f0 100644 ---- third_party/libwebrtc/call/bitrate_allocator_gn/moz.build -+++ third_party/libwebrtc/call/bitrate_allocator_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("bitstream_parser_api_gn") +diff --git third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build +index 987a01bd2f1a..dfcfda00467b 100644 +--- third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build ++++ third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -18904,7 +20183,7 @@ index ce93a0952f60..b5b26a5563f0 100644 FINAL_LIBRARY = "webrtc" -@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -18912,7 +20191,7 @@ index ce93a0952f60..b5b26a5563f0 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -18923,6 +20202,7 @@ index ce93a0952f60..b5b26a5563f0 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ +- "GLESv2", - "log" - ] - @@ -18957,6 +20237,7 @@ index ce93a0952f60..b5b26a5563f0 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -19014,6 +20295,24 @@ index ce93a0952f60..b5b26a5563f0 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -19047,8 +20346,7 @@ index ce93a0952f60..b5b26a5563f0 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -19066,34 +20364,40 @@ index ce93a0952f60..b5b26a5563f0 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("bitrate_allocator_gn") -diff --git third_party/libwebrtc/call/bitrate_configurator_gn/moz.build third_party/libwebrtc/call/bitrate_configurator_gn/moz.build -index 01759daf9e0e..4b41f4da802d 100644 ---- third_party/libwebrtc/call/bitrate_configurator_gn/moz.build -+++ third_party/libwebrtc/call/bitrate_configurator_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("rtc_software_fallback_wrappers_gn") +diff --git third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build +index a308bfc58fd9..50cd221a39d7 100644 +--- third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build ++++ third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -19102,7 +20406,7 @@ index 01759daf9e0e..4b41f4da802d 100644 FINAL_LIBRARY = "webrtc" -@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -19110,7 +20414,7 @@ index 01759daf9e0e..4b41f4da802d 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -19121,7 +20425,6 @@ index 01759daf9e0e..4b41f4da802d 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -19149,14 +20452,10 @@ index 01759daf9e0e..4b41f4da802d 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -19191,13 +20490,6 @@ index 01759daf9e0e..4b41f4da802d 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -19214,6 +20506,24 @@ index 01759daf9e0e..4b41f4da802d 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -19247,8 +20557,7 @@ index 01759daf9e0e..4b41f4da802d 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -19266,34 +20575,40 @@ index 01759daf9e0e..4b41f4da802d 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("bitrate_configurator_gn") -diff --git third_party/libwebrtc/call/call_gn/moz.build third_party/libwebrtc/call/call_gn/moz.build -index 75999f70ebf4..2aa75160b723 100644 ---- third_party/libwebrtc/call/call_gn/moz.build -+++ third_party/libwebrtc/call/call_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("scalability_mode_gn") +diff --git third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build +index eccdc6cfc778..748f6fb1b597 100644 +--- third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build ++++ third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -19302,7 +20617,7 @@ index 75999f70ebf4..2aa75160b723 100644 FINAL_LIBRARY = "webrtc" -@@ -44,173 +53,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -53,183 +62,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -19310,7 +20625,7 @@ index 75999f70ebf4..2aa75160b723 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -19321,7 +20636,6 @@ index 75999f70ebf4..2aa75160b723 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -19349,14 +20663,10 @@ index 75999f70ebf4..2aa75160b723 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -19393,9 +20703,6 @@ index 75999f70ebf4..2aa75160b723 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -19414,6 +20721,24 @@ index 75999f70ebf4..2aa75160b723 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -19447,8 +20772,7 @@ index 75999f70ebf4..2aa75160b723 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -19466,34 +20790,40 @@ index 75999f70ebf4..2aa75160b723 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("call_gn") -diff --git third_party/libwebrtc/call/call_interfaces_gn/moz.build third_party/libwebrtc/call/call_interfaces_gn/moz.build -index 8972117d5a3b..f4aba62a81f9 100644 ---- third_party/libwebrtc/call/call_interfaces_gn/moz.build -+++ third_party/libwebrtc/call/call_interfaces_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("video_codecs_api_gn") +diff --git third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build +index 2769bef0eb29..2b71c8370242 100644 +--- third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build ++++ third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -19502,7 +20832,7 @@ index 8972117d5a3b..f4aba62a81f9 100644 FINAL_LIBRARY = "webrtc" -@@ -45,173 +54,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -19510,7 +20840,7 @@ index 8972117d5a3b..f4aba62a81f9 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -19521,7 +20851,6 @@ index 8972117d5a3b..f4aba62a81f9 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -19550,13 +20879,13 @@ index 8972117d5a3b..f4aba62a81f9 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -19614,6 +20943,24 @@ index 8972117d5a3b..f4aba62a81f9 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -19647,8 +20994,7 @@ index 8972117d5a3b..f4aba62a81f9 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -19666,34 +21012,40 @@ index 8972117d5a3b..f4aba62a81f9 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("call_interfaces_gn") -diff --git third_party/libwebrtc/call/fake_network_gn/moz.build third_party/libwebrtc/call/fake_network_gn/moz.build -index ca7850ae8954..c58df99eee98 100644 ---- third_party/libwebrtc/call/fake_network_gn/moz.build -+++ third_party/libwebrtc/call/fake_network_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 77f7ba4d70db..524de95cf6e8 100644 +--- third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build ++++ third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -19702,7 +21054,7 @@ index ca7850ae8954..c58df99eee98 100644 FINAL_LIBRARY = "webrtc" -@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -19710,7 +21062,7 @@ index ca7850ae8954..c58df99eee98 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -19720,11 +21072,6 @@ index ca7850ae8954..c58df99eee98 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "GLESv2", -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -19749,14 +21096,10 @@ index ca7850ae8954..c58df99eee98 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -19791,13 +21134,6 @@ index ca7850ae8954..c58df99eee98 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -19807,14 +21143,26 @@ index ca7850ae8954..c58df99eee98 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -19836,9 +21184,10 @@ index ca7850ae8954..c58df99eee98 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -19847,12 +21196,7 @@ index ca7850ae8954..c58df99eee98 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -19867,33 +21211,30 @@ index ca7850ae8954..c58df99eee98 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("fake_network_gn") -diff --git third_party/libwebrtc/call/rtp_interfaces_gn/moz.build third_party/libwebrtc/call/rtp_interfaces_gn/moz.build -index ab48081ff0cb..257c6b99309d 100644 ---- third_party/libwebrtc/call/rtp_interfaces_gn/moz.build -+++ third_party/libwebrtc/call/rtp_interfaces_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("video_track_source_constraints_gn") +diff --git third_party/libwebrtc/audio/audio_gn/moz.build third_party/libwebrtc/audio/audio_gn/moz.build +index 8a35de2e88b4..beb8a0df1b72 100644 +--- third_party/libwebrtc/audio/audio_gn/moz.build ++++ third_party/libwebrtc/audio/audio_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -19902,7 +21243,7 @@ index ab48081ff0cb..257c6b99309d 100644 FINAL_LIBRARY = "webrtc" -@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -55,191 +64,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -19910,7 +21251,7 @@ index ab48081ff0cb..257c6b99309d 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -19950,13 +21291,13 @@ index ab48081ff0cb..257c6b99309d 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -20014,6 +21355,24 @@ index ab48081ff0cb..257c6b99309d 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -20047,8 +21406,7 @@ index ab48081ff0cb..257c6b99309d 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -20066,34 +21424,40 @@ index ab48081ff0cb..257c6b99309d 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("rtp_interfaces_gn") -diff --git third_party/libwebrtc/call/rtp_receiver_gn/moz.build third_party/libwebrtc/call/rtp_receiver_gn/moz.build -index dd5ab4f0d09e..b6edd7ceb13d 100644 ---- third_party/libwebrtc/call/rtp_receiver_gn/moz.build -+++ third_party/libwebrtc/call/rtp_receiver_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 81aea2d62785..1e0bdc5fc767 100644 +--- third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build ++++ third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -20102,7 +21466,7 @@ index dd5ab4f0d09e..b6edd7ceb13d 100644 FINAL_LIBRARY = "webrtc" -@@ -42,173 +51,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -20110,7 +21474,7 @@ index dd5ab4f0d09e..b6edd7ceb13d 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -20121,7 +21485,6 @@ index dd5ab4f0d09e..b6edd7ceb13d 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -20150,13 +21513,13 @@ index dd5ab4f0d09e..b6edd7ceb13d 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -20214,6 +21577,24 @@ index dd5ab4f0d09e..b6edd7ceb13d 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -20247,8 +21628,7 @@ index dd5ab4f0d09e..b6edd7ceb13d 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -20266,34 +21646,40 @@ index dd5ab4f0d09e..b6edd7ceb13d 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("rtp_receiver_gn") -diff --git third_party/libwebrtc/call/rtp_sender_gn/moz.build third_party/libwebrtc/call/rtp_sender_gn/moz.build -index 9431caf12bf5..b3d9d3b82917 100644 ---- third_party/libwebrtc/call/rtp_sender_gn/moz.build -+++ third_party/libwebrtc/call/rtp_sender_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 2e887471579d..5bb0f70142e3 100644 +--- third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build ++++ third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -20302,7 +21688,7 @@ index 9431caf12bf5..b3d9d3b82917 100644 FINAL_LIBRARY = "webrtc" -@@ -42,173 +51,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -52,190 +61,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -20310,7 +21696,7 @@ index 9431caf12bf5..b3d9d3b82917 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -20321,7 +21707,6 @@ index 9431caf12bf5..b3d9d3b82917 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -20350,13 +21735,13 @@ index 9431caf12bf5..b3d9d3b82917 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -20414,6 +21799,24 @@ index 9431caf12bf5..b3d9d3b82917 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -20447,8 +21850,7 @@ index 9431caf12bf5..b3d9d3b82917 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -20466,34 +21868,40 @@ index 9431caf12bf5..b3d9d3b82917 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("rtp_sender_gn") -diff --git third_party/libwebrtc/call/simulated_network_gn/moz.build third_party/libwebrtc/call/simulated_network_gn/moz.build -index 9c602d9f8de9..b3354ac10ad9 100644 ---- third_party/libwebrtc/call/simulated_network_gn/moz.build -+++ third_party/libwebrtc/call/simulated_network_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 6779dfa7cc01..75c30bf9abf4 100644 +--- third_party/libwebrtc/call/audio_sender_interface_gn/moz.build ++++ third_party/libwebrtc/call/audio_sender_interface_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -20502,7 +21910,7 @@ index 9c602d9f8de9..b3354ac10ad9 100644 FINAL_LIBRARY = "webrtc" -@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -20510,7 +21918,7 @@ index 9c602d9f8de9..b3354ac10ad9 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -20521,7 +21929,6 @@ index 9c602d9f8de9..b3354ac10ad9 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -20549,14 +21956,10 @@ index 9c602d9f8de9..b3354ac10ad9 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -20593,9 +21996,6 @@ index 9c602d9f8de9..b3354ac10ad9 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -20607,14 +22007,26 @@ index 9c602d9f8de9..b3354ac10ad9 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -20636,9 +22048,10 @@ index 9c602d9f8de9..b3354ac10ad9 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -20647,12 +22060,7 @@ index 9c602d9f8de9..b3354ac10ad9 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -20667,33 +22075,30 @@ index 9c602d9f8de9..b3354ac10ad9 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("simulated_network_gn") -diff --git third_party/libwebrtc/call/simulated_packet_receiver_gn/moz.build third_party/libwebrtc/call/simulated_packet_receiver_gn/moz.build -index 6ad189c079e1..4a15248bad0d 100644 ---- third_party/libwebrtc/call/simulated_packet_receiver_gn/moz.build -+++ third_party/libwebrtc/call/simulated_packet_receiver_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("audio_sender_interface_gn") +diff --git third_party/libwebrtc/call/bitrate_allocator_gn/moz.build third_party/libwebrtc/call/bitrate_allocator_gn/moz.build +index ef48a850a44f..7e63d38a987e 100644 +--- third_party/libwebrtc/call/bitrate_allocator_gn/moz.build ++++ third_party/libwebrtc/call/bitrate_allocator_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -20702,7 +22107,7 @@ index 6ad189c079e1..4a15248bad0d 100644 FINAL_LIBRARY = "webrtc" -@@ -36,161 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -20710,7 +22115,7 @@ index 6ad189c079e1..4a15248bad0d 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -20721,7 +22126,6 @@ index 6ad189c079e1..4a15248bad0d 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -20750,13 +22154,13 @@ index 6ad189c079e1..4a15248bad0d 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -20807,9 +22211,31 @@ index 6ad189c079e1..4a15248bad0d 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -20844,6 +22270,10 @@ index 6ad189c079e1..4a15248bad0d 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -20857,30 +22287,40 @@ index 6ad189c079e1..4a15248bad0d 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("simulated_packet_receiver_gn") -diff --git third_party/libwebrtc/call/video_stream_api_gn/moz.build third_party/libwebrtc/call/video_stream_api_gn/moz.build -index 82aaa062035f..4f21a4bb1f2d 100644 ---- third_party/libwebrtc/call/video_stream_api_gn/moz.build -+++ third_party/libwebrtc/call/video_stream_api_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 b70008b5486c..f62f036ab699 100644 +--- third_party/libwebrtc/call/bitrate_configurator_gn/moz.build ++++ third_party/libwebrtc/call/bitrate_configurator_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -20889,7 +22329,7 @@ index 82aaa062035f..4f21a4bb1f2d 100644 FINAL_LIBRARY = "webrtc" -@@ -41,173 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -20897,7 +22337,7 @@ index 82aaa062035f..4f21a4bb1f2d 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -20908,7 +22348,6 @@ index 82aaa062035f..4f21a4bb1f2d 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -20937,13 +22376,13 @@ index 82aaa062035f..4f21a4bb1f2d 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -21001,6 +22440,24 @@ index 82aaa062035f..4f21a4bb1f2d 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -21034,8 +22491,7 @@ index 82aaa062035f..4f21a4bb1f2d 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -21053,34 +22509,40 @@ index 82aaa062035f..4f21a4bb1f2d 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("video_stream_api_gn") -diff --git third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build -index a67b1c401d70..d7fe36bb19ad 100644 ---- third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build -+++ third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build -@@ -16,10 +16,19 @@ CXXFLAGS += [ ++ DEFINES["USE_X11"] = "1" + Library("bitrate_configurator_gn") +diff --git third_party/libwebrtc/call/call_gn/moz.build third_party/libwebrtc/call/call_gn/moz.build +index 1f5190649461..21474e0e8eb1 100644 +--- third_party/libwebrtc/call/call_gn/moz.build ++++ third_party/libwebrtc/call/call_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -21089,7 +22551,7 @@ index a67b1c401d70..d7fe36bb19ad 100644 FINAL_LIBRARY = "webrtc" -@@ -46,133 +55,9 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -21097,7 +22559,7 @@ index a67b1c401d70..d7fe36bb19ad 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -21108,6 +22570,7 @@ index a67b1c401d70..d7fe36bb19ad 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ +- "GLESv2", - "log" - ] - @@ -21130,7 +22593,6 @@ index a67b1c401d70..d7fe36bb19ad 100644 - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_GNU_SOURCE"] = True - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True @@ -21143,6 +22605,7 @@ index a67b1c401d70..d7fe36bb19ad 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -21184,166 +22647,40 @@ index a67b1c401d70..d7fe36bb19ad 100644 - "secur32", - "winmm" - ] -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- - DEFINES["_DEBUG"] = True ++ DEFINES["_DEBUG"] = True --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" -- --if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": - - CXXFLAGS += [ -- "-msse2" +- "-mfpu=neon" - ] - -- OS_LIBS += [ -- "android_support" -- ] +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - 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 555e049415d3..22e6d796aa11 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True -+DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["_FILE_OFFSET_BITS"] = "64" -+DEFINES["_LARGEFILE64_SOURCE"] = True -+DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True - - FINAL_LIBRARY = "webrtc" - -@@ -36,149 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: - if CONFIG["MOZ_DEBUG"] == "1": + if CONFIG["CPU_ARCH"] == "mips32": - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" -- --if CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" -- DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True - DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - --if CONFIG["OS_TARGET"] == "Darwin": +-if CONFIG["CPU_ARCH"] == "mips64": - -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True -- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_AURA"] = "1" -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_NSS_CERTS"] = "1" -- DEFINES["USE_OZONE"] = "1" -- DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True -- DEFINES["NOMINMAX"] = True -- DEFINES["NTDDI_VERSION"] = "0x0A000000" -- DEFINES["PSAPI_VERSION"] = "2" -- DEFINES["UNICODE"] = True -- DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True -- DEFINES["WIN32"] = True -- DEFINES["WIN32_LEAN_AND_MEAN"] = True -- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" -- DEFINES["WINVER"] = "0x0A00" -- DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_RAND_S"] = True -- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True -- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True -- DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True -- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True -- DEFINES["_SECURE_ATL"] = True -- DEFINES["_UNICODE"] = True -- DEFINES["_WIN32_WINNT"] = "0x0A00" -- DEFINES["_WINDOWS"] = True -- DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": +- DEFINES["_GNU_SOURCE"] = True - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True + if CONFIG["CPU_ARCH"] == "x86": --if CONFIG["CPU_ARCH"] == "arm": +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +-if CONFIG["CPU_ARCH"] == "x86_64": - -- 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["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -21378,6 +22715,10 @@ index 555e049415d3..22e6d796aa11 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -21391,30 +22732,40 @@ index 555e049415d3..22e6d796aa11 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 f33242a6409c..491577816add 100644 ---- third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build -+++ third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 9782bf65f418..d02126352f57 100644 +--- third_party/libwebrtc/call/call_interfaces_gn/moz.build ++++ third_party/libwebrtc/call/call_interfaces_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -21423,23 +22774,7 @@ index f33242a6409c..491577816add 100644 FINAL_LIBRARY = "webrtc" -@@ -36,6 +45,7 @@ UNIFIED_SOURCES += [ - "/third_party/libwebrtc/common_audio/ring_buffer.c", - "/third_party/libwebrtc/common_audio/signal_processing/auto_corr_to_refl_coef.c", - "/third_party/libwebrtc/common_audio/signal_processing/auto_correlation.c", -+ "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", - "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c", - "/third_party/libwebrtc/common_audio/signal_processing/copy_set_operations.c", - "/third_party/libwebrtc/common_audio/signal_processing/cross_correlation.c", -@@ -43,6 +53,7 @@ UNIFIED_SOURCES += [ - "/third_party/libwebrtc/common_audio/signal_processing/downsample_fast.c", - "/third_party/libwebrtc/common_audio/signal_processing/energy.c", - "/third_party/libwebrtc/common_audio/signal_processing/filter_ar.c", -+ "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c", - "/third_party/libwebrtc/common_audio/signal_processing/filter_ma_fast_q12.c", - "/third_party/libwebrtc/common_audio/signal_processing/get_hanning_window.c", - "/third_party/libwebrtc/common_audio/signal_processing/get_scaling_square.c", -@@ -78,227 +89,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -49,190 +58,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -21447,7 +22782,7 @@ index f33242a6409c..491577816add 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -21470,11 +22805,6 @@ index f33242a6409c..491577816add 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" -- ] -- -if CONFIG["OS_TARGET"] == "Linux": - - DEFINES["USE_AURA"] = "1" @@ -21497,6 +22827,7 @@ index f33242a6409c..491577816add 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -21506,11 +22837,6 @@ index f33242a6409c..491577816add 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" -- ] -- -if CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True @@ -21543,11 +22869,6 @@ index f33242a6409c..491577816add 100644 - "secur32", - "winmm" - ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -21557,7 +22878,7 @@ index f33242a6409c..491577816add 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CFLAGS += [ +- CXXFLAGS += [ - "-mfpu=neon" - ] - @@ -21565,12 +22886,23 @@ index f33242a6409c..491577816add 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "ppc64": + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" -- ] +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -21596,13 +22928,6 @@ index f33242a6409c..491577816add 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android": -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" -- ] -- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -21611,9 +22936,8 @@ index f33242a6409c..491577816add 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CFLAGS += [ +- + CXXFLAGS += [ "-msse2" ] @@ -21621,70 +22945,49 @@ index f33242a6409c..491577816add 100644 - "android_support" - ] - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" -- ] -- --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android": -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" -- ] -- -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" -- ] -- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- -- CFLAGS += [ ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" -- ] -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" -- ] -- - Library("common_audio_c_gn") -diff --git third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build -index 595e221a1776..ce15404f651b 100644 ---- third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build -+++ third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("call_interfaces_gn") +diff --git third_party/libwebrtc/call/receive_stream_interface_gn/moz.build third_party/libwebrtc/call/receive_stream_interface_gn/moz.build +index 7be3350326f2..2d90f7bf5333 100644 +--- third_party/libwebrtc/call/receive_stream_interface_gn/moz.build ++++ third_party/libwebrtc/call/receive_stream_interface_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -21693,7 +22996,7 @@ index 595e221a1776..ce15404f651b 100644 FINAL_LIBRARY = "webrtc" -@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -21701,7 +23004,7 @@ index 595e221a1776..ce15404f651b 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -21746,6 +23049,7 @@ index 595e221a1776..ce15404f651b 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -21796,14 +23100,26 @@ index 595e221a1776..ce15404f651b 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -21825,9 +23141,10 @@ index 595e221a1776..ce15404f651b 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -21836,12 +23153,7 @@ index 595e221a1776..ce15404f651b 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -21856,33 +23168,30 @@ index 595e221a1776..ce15404f651b 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("common_audio_cc_gn") -diff --git third_party/libwebrtc/common_audio/common_audio_gn/moz.build third_party/libwebrtc/common_audio/common_audio_gn/moz.build -index f2df0ce86b01..da44b258281e 100644 ---- third_party/libwebrtc/common_audio/common_audio_gn/moz.build -+++ third_party/libwebrtc/common_audio/common_audio_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("receive_stream_interface_gn") +diff --git third_party/libwebrtc/call/rtp_interfaces_gn/moz.build third_party/libwebrtc/call/rtp_interfaces_gn/moz.build +index 8e64b723410f..f0698d5291ce 100644 +--- third_party/libwebrtc/call/rtp_interfaces_gn/moz.build ++++ third_party/libwebrtc/call/rtp_interfaces_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -21891,7 +23200,7 @@ index f2df0ce86b01..da44b258281e 100644 FINAL_LIBRARY = "webrtc" -@@ -53,171 +62,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -21899,7 +23208,7 @@ index f2df0ce86b01..da44b258281e 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -21944,6 +23253,7 @@ index f2df0ce86b01..da44b258281e 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -22001,6 +23311,24 @@ index f2df0ce86b01..da44b258281e 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -22034,8 +23362,7 @@ index f2df0ce86b01..da44b258281e 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -22053,36 +23380,40 @@ index f2df0ce86b01..da44b258281e 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("common_audio_gn") -diff --git third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build -index 9fd448df41a0..7e4b1ca13fc2 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 -@@ -11,11 +11,21 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 481a02fe5580..4b5e64a7b0a9 100644 +--- third_party/libwebrtc/call/rtp_receiver_gn/moz.build ++++ third_party/libwebrtc/call/rtp_receiver_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" -+DEFINES["WEBRTC_ARCH_ARM64"] = True ++DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" - DEFINES["WEBRTC_HAS_NEON"] = True DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +DEFINES["WEBRTC_POSIX"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True @@ -22091,7 +23422,7 @@ index 9fd448df41a0..7e4b1ca13fc2 100644 FINAL_LIBRARY = "webrtc" -@@ -43,147 +53,6 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -22099,7 +23430,7 @@ index 9fd448df41a0..7e4b1ca13fc2 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -22115,7 +23446,6 @@ index 9fd448df41a0..7e4b1ca13fc2 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -22133,7 +23463,6 @@ index 9fd448df41a0..7e4b1ca13fc2 100644 - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_GNU_SOURCE"] = True - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True @@ -22146,8 +23475,8 @@ index 9fd448df41a0..7e4b1ca13fc2 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" @@ -22164,7 +23493,6 @@ index 9fd448df41a0..7e4b1ca13fc2 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -22189,20 +23517,45 @@ index 9fd448df41a0..7e4b1ca13fc2 100644 - "secur32", - "winmm" - ] -- ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + -if CONFIG["CPU_ARCH"] == "arm": - -- CFLAGS += [ +- CXXFLAGS += [ - "-mfpu=neon" - ] - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True - - DEFINES["_DEBUG"] = True +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_DEBUG"] = True @@ -22223,10 +23576,6 @@ index 9fd448df41a0..7e4b1ca13fc2 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["WEBRTC_ARCH_ARM64"] = True -- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -22234,29 +23583,59 @@ index 9fd448df41a0..7e4b1ca13fc2 100644 - "unwind" - ] - +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["_GNU_SOURCE"] = True - - Library("common_audio_neon_c_gn") -diff --git third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build -index b7088732c3e2..e9a8ecbe4a55 100644 ---- third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build -+++ third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build -@@ -11,11 +11,21 @@ AllowCompilerWarnings() +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 f823d8ea77d3..2959f53394c1 100644 +--- third_party/libwebrtc/call/rtp_sender_gn/moz.build ++++ third_party/libwebrtc/call/rtp_sender_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" -+DEFINES["WEBRTC_ARCH_ARM64"] = True ++DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" - DEFINES["WEBRTC_HAS_NEON"] = True DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +DEFINES["WEBRTC_POSIX"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True @@ -22265,7 +23644,7 @@ index b7088732c3e2..e9a8ecbe4a55 100644 FINAL_LIBRARY = "webrtc" -@@ -42,147 +52,6 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -22273,7 +23652,7 @@ index b7088732c3e2..e9a8ecbe4a55 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -22289,7 +23668,6 @@ index b7088732c3e2..e9a8ecbe4a55 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -22307,7 +23685,6 @@ index b7088732c3e2..e9a8ecbe4a55 100644 - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_GNU_SOURCE"] = True - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True @@ -22320,8 +23697,8 @@ index b7088732c3e2..e9a8ecbe4a55 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" @@ -22338,7 +23715,6 @@ index b7088732c3e2..e9a8ecbe4a55 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -22363,7 +23739,13 @@ index b7088732c3e2..e9a8ecbe4a55 100644 - "secur32", - "winmm" - ] -- ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + -if CONFIG["CPU_ARCH"] == "arm": - - CXXFLAGS += [ @@ -22372,11 +23754,30 @@ index b7088732c3e2..e9a8ecbe4a55 100644 - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True - - DEFINES["_DEBUG"] = True +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_DEBUG"] = True @@ -22397,10 +23798,6 @@ index b7088732c3e2..e9a8ecbe4a55 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["WEBRTC_ARCH_ARM64"] = True -- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -22408,27 +23805,59 @@ index b7088732c3e2..e9a8ecbe4a55 100644 - "unwind" - ] - +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ARCH_ARM64"] = True +- 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 624458bd18aa..22231d6cac19 100644 ---- third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build -+++ third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("rtp_sender_gn") +diff --git third_party/libwebrtc/call/version_gn/moz.build third_party/libwebrtc/call/version_gn/moz.build +index d6382035216b..b2052c8cd0fb 100644 +--- third_party/libwebrtc/call/version_gn/moz.build ++++ third_party/libwebrtc/call/version_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -22437,7 +23866,7 @@ index 624458bd18aa..22231d6cac19 100644 FINAL_LIBRARY = "webrtc" -@@ -41,155 +50,16 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -22445,7 +23874,7 @@ index 624458bd18aa..22231d6cac19 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -22455,16 +23884,8 @@ index 624458bd18aa..22231d6cac19 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -22482,23 +23903,15 @@ index 624458bd18aa..22231d6cac19 100644 - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_GNU_SOURCE"] = True - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -22533,14 +23946,41 @@ index 624458bd18aa..22231d6cac19 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": - -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" +- CXXFLAGS += [ +- "-mfpu=neon" - ] - +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -22555,8 +23995,8 @@ index 624458bd18aa..22231d6cac19 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True - +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" @@ -22565,52 +24005,66 @@ index 624458bd18aa..22231d6cac19 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2", -- "-msse2" +- OS_LIBS += [ +- "android_support", +- "unwind" - ] - +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android": +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++if CONFIG["CPU_ARCH"] == "x86_64": - CXXFLAGS += [ - "-msse2", - "-msse2" - ] +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86_64": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - 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 3b09c379f34a..ebf3a4dc01ad 100644 ---- third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build -+++ third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + Library("version_gn") +diff --git third_party/libwebrtc/call/video_stream_api_gn/moz.build third_party/libwebrtc/call/video_stream_api_gn/moz.build +index c441da830946..7eea7977d9df 100644 +--- third_party/libwebrtc/call/video_stream_api_gn/moz.build ++++ third_party/libwebrtc/call/video_stream_api_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -22619,7 +24073,7 @@ index 3b09c379f34a..ebf3a4dc01ad 100644 FINAL_LIBRARY = "webrtc" -@@ -41,171 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -22627,7 +24081,7 @@ index 3b09c379f34a..ebf3a4dc01ad 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -22672,6 +24126,7 @@ index 3b09c379f34a..ebf3a4dc01ad 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -22729,6 +24184,24 @@ index 3b09c379f34a..ebf3a4dc01ad 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -22762,8 +24235,7 @@ index 3b09c379f34a..ebf3a4dc01ad 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -22781,34 +24253,41 @@ index 3b09c379f34a..ebf3a4dc01ad 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("fir_filter_factory_gn") -diff --git third_party/libwebrtc/common_audio/fir_filter_gn/moz.build third_party/libwebrtc/common_audio/fir_filter_gn/moz.build -index d1e07d8c39cc..9275144df948 100644 ---- third_party/libwebrtc/common_audio/fir_filter_gn/moz.build -+++ third_party/libwebrtc/common_audio/fir_filter_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("video_stream_api_gn") +diff --git third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build +index 5526be7b8bed..30d931689b62 100644 +--- third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build ++++ third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build +@@ -17,12 +17,21 @@ CXXFLAGS += [ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -22817,7 +24296,7 @@ index d1e07d8c39cc..9275144df948 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -50,137 +59,16 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -22825,7 +24304,7 @@ index d1e07d8c39cc..9275144df948 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -22835,6 +24314,10 @@ index d1e07d8c39cc..9275144df948 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -22854,14 +24337,20 @@ index d1e07d8c39cc..9275144df948 100644 - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_GNU_SOURCE"] = True - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -22896,18 +24385,13 @@ index d1e07d8c39cc..9275144df948 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -22923,8 +24407,8 @@ index d1e07d8c39cc..9275144df948 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" @@ -22933,52 +24417,43 @@ index d1e07d8c39cc..9275144df948 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -- ++if CONFIG["CPU_ARCH"] == "x86": + + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- - Library("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 dbd69345430e..116a3a31c79d 100644 ---- third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build -+++ third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- CXXFLAGS += [ +- "-msse2" +- ] ++ DEFINES["USE_X11"] = "1" + Library("common_audio_avx2_gn") +diff --git third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build +index 9381d65ceafe..30c5b7a739fc 100644 +--- third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build ++++ third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -22987,7 +24462,7 @@ index dbd69345430e..116a3a31c79d 100644 FINAL_LIBRARY = "webrtc" -@@ -36,159 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -22995,7 +24470,7 @@ index dbd69345430e..116a3a31c79d 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -23005,10 +24480,6 @@ index dbd69345430e..116a3a31c79d 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -23033,13 +24504,10 @@ index dbd69345430e..116a3a31c79d 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -23074,13 +24542,6 @@ index dbd69345430e..116a3a31c79d 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -23094,6 +24555,27 @@ index dbd69345430e..116a3a31c79d 100644 - 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["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -23115,9 +24597,10 @@ index dbd69345430e..116a3a31c79d 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -23147,23 +24630,24 @@ index dbd69345430e..116a3a31c79d 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("sinc_resampler_gn") -diff --git third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build -index c49141bf6150..9890bd547a22 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("common_audio_c_arm_asm_gn") +diff --git third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build +index c9d2d986330f..cbb28b276a83 100644 +--- third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build ++++ third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -23172,15 +24656,16 @@ index c49141bf6150..9890bd547a22 100644 FINAL_LIBRARY = "webrtc" -@@ -40,96 +49,7 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -80,113 +89,12 @@ if not CONFIG["MOZ_DEBUG"]: 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"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -23194,6 +24679,10 @@ index c49141bf6150..9890bd547a22 100644 - "log" - ] - +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -23203,6 +24692,12 @@ index c49141bf6150..9890bd547a22 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", +- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c", +- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" +- ] +- -if CONFIG["OS_TARGET"] == "Linux": - - DEFINES["USE_AURA"] = "1" @@ -23225,6 +24720,7 @@ index c49141bf6150..9890bd547a22 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -23234,6 +24730,13 @@ index c49141bf6150..9890bd547a22 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", +- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c", +- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" +- ] ++if CONFIG["CPU_ARCH"] == "aarch64": + -if CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True @@ -23266,39 +24769,66 @@ index c49141bf6150..9890bd547a22 100644 - "secur32", - "winmm" - ] -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": ++ DEFINES["WEBRTC_ARCH_ARM64"] = True ++ DEFINES["WEBRTC_HAS_NEON"] = True -@@ -140,115 +60,25 @@ if CONFIG["CPU_ARCH"] == "aarch64": - "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc" + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", +@@ -194,26 +102,10 @@ if CONFIG["OS_TARGET"] == "WINNT": + "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" ] +-if CONFIG["CPU_ARCH"] == "aarch64": +- +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ +- CFLAGS += [ - "-mfpu=neon" - ] - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "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" +@@ -230,8 +122,6 @@ if CONFIG["CPU_ARCH"] == "mips32": + + if CONFIG["CPU_ARCH"] == "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", +@@ -246,85 +136,13 @@ if CONFIG["CPU_ARCH"] == "ppc64": + "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" + ] + +-if CONFIG["CPU_ARCH"] == "riscv64": - - UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc" +- "/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["CPU_ARCH"] == "x86": -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc" -- ] +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["CPU_ARCH"] == "x86_64": - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc" -- ] +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -23324,6 +24854,13 @@ index c49141bf6150..9890bd547a22 100644 - - DEFINES["USE_X11"] = "1" - +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android": +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", +- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" +- ] +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -23333,8 +24870,7 @@ index c49141bf6150..9890bd547a22 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ - "-msse2", + CFLAGS += [ "-msse2" ] @@ -23342,71 +24878,83 @@ index c49141bf6150..9890bd547a22 100644 - "android_support" - ] - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android": -- -- CXXFLAGS += [ -- "-msse2" +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", +- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" - ] - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Darwin": +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", +- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", +@@ -332,21 +150,9 @@ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": + "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" + ] + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c" +- ] +- -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2", +- CFLAGS += [ - "-msse2" -+ UNIFIED_SOURCES += [ -+ "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc" - ] +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86_64": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", +@@ -354,14 +160,8 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": + "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" ] +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "OpenBSD": -- -- CXXFLAGS += [ -- "-msse2" -+ UNIFIED_SOURCES += [ -+ "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc" - ] - - 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 21ca8d946852..13f537b170f7 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 -@@ -11,10 +11,19 @@ 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" +- ] ++ DEFINES["USE_X11"] = "1" + Library("common_audio_c_gn") +diff --git third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build +index 90260ba8646c..54512f5b3543 100644 +--- third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build ++++ third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -23415,7 +24963,7 @@ index 21ca8d946852..13f537b170f7 100644 FINAL_LIBRARY = "webrtc" -@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -23423,7 +24971,7 @@ index 21ca8d946852..13f537b170f7 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -23433,6 +24981,10 @@ index 21ca8d946852..13f537b170f7 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -23457,9 +25009,14 @@ index 21ca8d946852..13f537b170f7 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -23494,6 +25051,13 @@ index 21ca8d946852..13f537b170f7 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -23510,6 +25074,24 @@ index 21ca8d946852..13f537b170f7 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -23544,10 +25126,10 @@ index 21ca8d946852..13f537b170f7 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -23561,35 +25143,40 @@ index 21ca8d946852..13f537b170f7 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("fft_size_256_gn") -diff --git third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build -index 87610cfa7d92..f852648a29b5 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 c7b74d2e510c..1048f961f8f0 100644 +--- third_party/libwebrtc/common_audio/common_audio_gn/moz.build ++++ third_party/libwebrtc/common_audio/common_audio_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -23598,18 +25185,7 @@ index 87610cfa7d92..f852648a29b5 100644 FINAL_LIBRARY = "webrtc" -@@ -27,6 +36,10 @@ LOCAL_INCLUDES += [ - "/tools/profiler/public" - ] - -+UNIFIED_SOURCES += [ -+ "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -+] -+ - if not CONFIG["MOZ_DEBUG"]: - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" -@@ -36,202 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -56,190 +65,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -23617,7 +25193,7 @@ index 87610cfa7d92..f852648a29b5 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -23627,6 +25203,10 @@ index 87610cfa7d92..f852648a29b5 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -23636,10 +25216,6 @@ index 87610cfa7d92..f852648a29b5 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -- ] -- -if CONFIG["OS_TARGET"] == "Linux": - - DEFINES["USE_AURA"] = "1" @@ -23655,9 +25231,14 @@ index 87610cfa7d92..f852648a29b5 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -23667,10 +25248,6 @@ index 87610cfa7d92..f852648a29b5 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -- ] -- -if CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True @@ -23697,8 +25274,11 @@ index 87610cfa7d92..f852648a29b5 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" - ] + DEFINES["_DEBUG"] = True @@ -23709,19 +25289,31 @@ index 87610cfa7d92..f852648a29b5 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.S" -- ] + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "ppc64": +-if CONFIG["CPU_ARCH"] == "mips64": - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -- ] +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -23747,12 +25339,6 @@ index 87610cfa7d92..f852648a29b5 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android": -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -- ] -- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -23762,74 +25348,59 @@ index 87610cfa7d92..f852648a29b5 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -- ] -- --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android": -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -- ] -- -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -- ] -- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -- ] -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -- ] -- - Library("spl_sqrt_floor_gn") -diff --git third_party/libwebrtc/common_video/common_video_gn/moz.build third_party/libwebrtc/common_video/common_video_gn/moz.build -index c48343244bc0..c69696b581f9 100644 ---- third_party/libwebrtc/common_video/common_video_gn/moz.build -+++ third_party/libwebrtc/common_video/common_video_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 d51e7f4e3541..7d3d05a3e0af 100644 +--- third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build ++++ third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build +@@ -12,12 +12,22 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +DEFINES["WEBRTC_POSIX"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True @@ -23838,7 +25409,7 @@ index c48343244bc0..c69696b581f9 100644 FINAL_LIBRARY = "webrtc" -@@ -53,173 +62,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,148 +56,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -23846,7 +25417,7 @@ index c48343244bc0..c69696b581f9 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -23857,12 +25428,12 @@ index c48343244bc0..c69696b581f9 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - -if CONFIG["OS_TARGET"] == "Darwin": - +- DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -23880,20 +25451,22 @@ index c48343244bc0..c69696b581f9 100644 - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_GNU_SOURCE"] = True - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" @@ -23910,6 +25483,7 @@ index c48343244bc0..c69696b581f9 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -23934,22 +25508,15 @@ index c48343244bc0..c69696b581f9 100644 - "secur32", - "winmm" - ] -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - +- -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ +- 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": - @@ -23965,15 +25532,20 @@ index c48343244bc0..c69696b581f9 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android": - -- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_ARCH_ARM64"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - @@ -23982,54 +25554,30 @@ index c48343244bc0..c69696b581f9 100644 - "unwind" - ] - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- -- CXXFLAGS += [ -- "-msse2" -- ] -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True +- DEFINES["WEBRTC_ARCH_ARM64"] = True - - Library("common_video_gn") -diff --git third_party/libwebrtc/common_video/frame_counts_gn/moz.build third_party/libwebrtc/common_video/frame_counts_gn/moz.build -index 2c082466369f..84aa7f656bab 100644 ---- third_party/libwebrtc/common_video/frame_counts_gn/moz.build -+++ third_party/libwebrtc/common_video/frame_counts_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("common_audio_neon_c_gn") +diff --git third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build +index 8df7017bff19..8ad021bcb676 100644 +--- third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build ++++ third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build +@@ -12,12 +12,22 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +DEFINES["WEBRTC_POSIX"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True @@ -24038,7 +25586,7 @@ index 2c082466369f..84aa7f656bab 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,148 +55,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -24046,7 +25594,7 @@ index 2c082466369f..84aa7f656bab 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -24056,8 +25604,13 @@ index 2c082466369f..84aa7f656bab 100644 - 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -24075,15 +25628,22 @@ index 2c082466369f..84aa7f656bab 100644 - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_GNU_SOURCE"] = True - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" @@ -24100,6 +25660,7 @@ index 2c082466369f..84aa7f656bab 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -24117,18 +25678,22 @@ index 2c082466369f..84aa7f656bab 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] +- -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -24144,15 +25709,20 @@ index 2c082466369f..84aa7f656bab 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android": - -- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_ARCH_ARM64"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - @@ -24161,45 +25731,29 @@ index 2c082466369f..84aa7f656bab 100644 - "unwind" - ] - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -- -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True +- DEFINES["WEBRTC_ARCH_ARM64"] = True - - Library("frame_counts_gn") -diff --git third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build -index 0ef3fdcb1671..4ac389212d99 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("common_audio_neon_gn") +diff --git third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build +index 022ff2845548..81c11ad52373 100644 +--- third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build ++++ third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -24208,7 +25762,7 @@ index 0ef3fdcb1671..4ac389212d99 100644 FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,159 +54,23 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -24216,7 +25770,7 @@ index 0ef3fdcb1671..4ac389212d99 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -24232,6 +25786,10 @@ index 0ef3fdcb1671..4ac389212d99 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - +- CXXFLAGS += [ +- "-msse2" +- ] +- - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -24249,14 +25807,24 @@ index 0ef3fdcb1671..4ac389212d99 100644 - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_GNU_SOURCE"] = True - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - +- CXXFLAGS += [ +- "-msse2" +- ] +- - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -24291,27 +25859,18 @@ index 0ef3fdcb1671..4ac389212d99 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" - ] - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True -- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_DEBUG"] = True @@ -24332,17 +25891,11 @@ index 0ef3fdcb1671..4ac389212d99 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +if CONFIG["CPU_ARCH"] == "x86": CXXFLAGS += [ + "-msse2", "-msse2" ] @@ -24350,43 +25903,46 @@ index 0ef3fdcb1671..4ac389212d99 100644 - "android_support" - ] - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ - "-msse2" - ] - -- DEFINES["_GNU_SOURCE"] = True -- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["CPU_ARCH"] == "x86_64": + + CXXFLAGS += [ +- "-msse2", + "-msse2" + ] + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- - Library("generic_frame_descriptor_gn") -diff --git third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build -index a2dece6a12b7..432e51f463cb 100644 ---- third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build -+++ third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- CXXFLAGS += [ +- "-msse2" +- ] ++ DEFINES["USE_X11"] = "1" + Library("common_audio_sse2_gn") +diff --git third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build +index 52e5226e09a0..f34663641568 100644 +--- third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build ++++ third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -24395,7 +25951,7 @@ index a2dece6a12b7..432e51f463cb 100644 FINAL_LIBRARY = "webrtc" -@@ -43,164 +52,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -24403,7 +25959,7 @@ index a2dece6a12b7..432e51f463cb 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -24441,9 +25997,14 @@ index a2dece6a12b7..432e51f463cb 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -24480,6 +26041,9 @@ index a2dece6a12b7..432e51f463cb 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -24498,6 +26062,24 @@ index a2dece6a12b7..432e51f463cb 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -24532,10 +26114,10 @@ index a2dece6a12b7..432e51f463cb 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -24549,35 +26131,40 @@ index a2dece6a12b7..432e51f463cb 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("rtc_event_audio_gn") -diff --git third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build -index 0c9c2b9b381a..5dc18d4bb11a 100644 ---- third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build -+++ third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("fir_filter_factory_gn") +diff --git third_party/libwebrtc/common_audio/fir_filter_gn/moz.build third_party/libwebrtc/common_audio/fir_filter_gn/moz.build +index f931502550d0..3ccb102e85a9 100644 +--- third_party/libwebrtc/common_audio/fir_filter_gn/moz.build ++++ third_party/libwebrtc/common_audio/fir_filter_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -24586,7 +26173,7 @@ index 0c9c2b9b381a..5dc18d4bb11a 100644 FINAL_LIBRARY = "webrtc" -@@ -45,173 +54,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -24594,7 +26181,7 @@ index 0c9c2b9b381a..5dc18d4bb11a 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -24604,11 +26191,6 @@ index 0c9c2b9b381a..5dc18d4bb11a 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "GLESv2", -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -24633,14 +26215,10 @@ index 0c9c2b9b381a..5dc18d4bb11a 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -24675,13 +26253,6 @@ index 0c9c2b9b381a..5dc18d4bb11a 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -24691,14 +26262,26 @@ index 0c9c2b9b381a..5dc18d4bb11a 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -24720,9 +26303,10 @@ index 0c9c2b9b381a..5dc18d4bb11a 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -24731,12 +26315,7 @@ index 0c9c2b9b381a..5dc18d4bb11a 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -24751,33 +26330,30 @@ index 0c9c2b9b381a..5dc18d4bb11a 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("rtc_event_bwe_gn") -diff --git third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build -index abcbf4c5fadd..91ebed4cde5d 100644 ---- third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build -+++ third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("fir_filter_gn") +diff --git third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build +index 57e889cebd1b..8dc865c12715 100644 +--- third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build ++++ third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -24786,7 +26362,7 @@ index abcbf4c5fadd..91ebed4cde5d 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -24794,7 +26370,7 @@ index abcbf4c5fadd..91ebed4cde5d 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -24832,9 +26408,14 @@ index abcbf4c5fadd..91ebed4cde5d 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -24871,6 +26452,9 @@ index abcbf4c5fadd..91ebed4cde5d 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -24882,14 +26466,26 @@ index abcbf4c5fadd..91ebed4cde5d 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -24911,9 +26507,10 @@ index abcbf4c5fadd..91ebed4cde5d 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -24923,10 +26520,6 @@ index abcbf4c5fadd..91ebed4cde5d 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -24940,35 +26533,31 @@ index abcbf4c5fadd..91ebed4cde5d 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("rtc_event_pacing_gn") -diff --git third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build -index bb7d3ae4cfbf..8f2bd7a66167 100644 ---- third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build -+++ third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("sinc_resampler_gn") +diff --git third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build +index 2f5623b61072..284df3697995 100644 +--- third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build ++++ third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -24977,7 +26566,7 @@ index bb7d3ae4cfbf..8f2bd7a66167 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +52,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,97 +52,7 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -24985,7 +26574,7 @@ index bb7d3ae4cfbf..8f2bd7a66167 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -24996,7 +26585,6 @@ index bb7d3ae4cfbf..8f2bd7a66167 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -25025,13 +26613,13 @@ index bb7d3ae4cfbf..8f2bd7a66167 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -25077,8 +26665,9 @@ index bb7d3ae4cfbf..8f2bd7a66167 100644 if CONFIG["CPU_ARCH"] == "aarch64": - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +@@ -144,133 +63,42 @@ if CONFIG["CPU_ARCH"] == "aarch64": + "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc" + ] -if CONFIG["CPU_ARCH"] == "arm": - @@ -25090,6 +26679,40 @@ index bb7d3ae4cfbf..8f2bd7a66167 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc" +- ] +- + if CONFIG["CPU_ARCH"] == "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["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- + if CONFIG["CPU_ARCH"] == "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["CPU_ARCH"] == "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 @@ -25122,9 +26745,9 @@ index bb7d3ae4cfbf..8f2bd7a66167 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ + "-msse2", "-msse2" ] @@ -25132,6 +26755,21 @@ index bb7d3ae4cfbf..8f2bd7a66167 100644 - "android_support" - ] - +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android": +- +- CXXFLAGS += [ +- "-msse2" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Darwin": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" ++ UNIFIED_SOURCES += [ ++ "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc" + ] + -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True @@ -25141,34 +26779,52 @@ index bb7d3ae4cfbf..8f2bd7a66167 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- -- CXXFLAGS += [ -- "-msse2" -- ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + + CXXFLAGS += [ +- "-msse2", + "-msse2" + ] + - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" ++ UNIFIED_SOURCES += [ ++ "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc" + ] + - DEFINES["_GNU_SOURCE"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "OpenBSD": - - Library("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 30ec45d4504a..673345365fea 100644 ---- third_party/libwebrtc/logging/rtc_event_video_gn/moz.build -+++ third_party/libwebrtc/logging/rtc_event_video_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() +- CXXFLAGS += [ +- "-msse2" +- ] ++ DEFINES["USE_X11"] = "1" + Library("fft_size_128_gn") +diff --git third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build +index 8639a7ae2e0e..3105fcab9d6b 100644 +--- third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build ++++ third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -25177,7 +26833,7 @@ index 30ec45d4504a..673345365fea 100644 FINAL_LIBRARY = "webrtc" -@@ -41,164 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -25185,7 +26841,7 @@ index 30ec45d4504a..673345365fea 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -25195,10 +26851,6 @@ index 30ec45d4504a..673345365fea 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -25226,6 +26878,7 @@ index 30ec45d4504a..673345365fea 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -25260,10 +26913,6 @@ index 30ec45d4504a..673345365fea 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -25280,6 +26929,24 @@ index 30ec45d4504a..673345365fea 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -25314,10 +26981,10 @@ index 30ec45d4504a..673345365fea 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -25331,35 +26998,40 @@ index 30ec45d4504a..673345365fea 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("rtc_event_video_gn") -diff --git third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build -index 64d287112de4..b7341fb31efe 100644 ---- third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build -+++ third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("fft_size_256_gn") +diff --git third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build +index 4bae7df22774..5d194b7d816a 100644 +--- third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build ++++ third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -25368,7 +27040,7 @@ index 64d287112de4..b7341fb31efe 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,115 +48,21 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -25376,7 +27048,7 @@ index 64d287112de4..b7341fb31efe 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -25386,10 +27058,6 @@ index 64d287112de4..b7341fb31efe 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -25399,6 +27067,10 @@ index 64d287112de4..b7341fb31efe 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" +- ] +- -if CONFIG["OS_TARGET"] == "Linux": - - DEFINES["USE_AURA"] = "1" @@ -25417,6 +27089,7 @@ index 64d287112de4..b7341fb31efe 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -25426,6 +27099,10 @@ index 64d287112de4..b7341fb31efe 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" +- ] +- -if CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True @@ -25452,8 +27129,8 @@ index 64d287112de4..b7341fb31efe 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - -- OS_LIBS += [ -- "winmm" +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" - ] + DEFINES["_DEBUG"] = True @@ -25464,14 +27141,51 @@ index 64d287112de4..b7341fb31efe 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - +- SOURCES += [ +- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.S" ++ UNIFIED_SOURCES += [ ++ "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" + ] + + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True + + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_mips.c" +@@ -155,8 +70,6 @@ if CONFIG["CPU_ARCH"] == "mips32": + + if CONFIG["CPU_ARCH"] == "mips64": + +- DEFINES["_GNU_SOURCE"] = True +- + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" + ] +@@ -167,107 +80,28 @@ if CONFIG["CPU_ARCH"] == "ppc64": + "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" + ] + +-if CONFIG["CPU_ARCH"] == "riscv64": +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" +- ] +- + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -25496,6 +27210,12 @@ index 64d287112de4..b7341fb31efe 100644 - - DEFINES["USE_X11"] = "1" - +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android": +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" +- ] +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -25505,52 +27225,79 @@ index 64d287112de4..b7341fb31efe 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android": +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" +- ] +- -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": +- +- CFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - CXXFLAGS += [ - "-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" ] -- DEFINES["_GNU_SOURCE"] = True -- -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True - - Library("rtc_stream_config_gn") -diff --git third_party/libwebrtc/media/rtc_constants_gn/moz.build third_party/libwebrtc/media/rtc_constants_gn/moz.build -index e974486fb73f..6ed2d47ba9a7 100644 ---- third_party/libwebrtc/media/rtc_constants_gn/moz.build -+++ third_party/libwebrtc/media/rtc_constants_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" +- ] ++ DEFINES["USE_X11"] = "1" + Library("spl_sqrt_floor_gn") +diff --git third_party/libwebrtc/common_video/common_video_gn/moz.build third_party/libwebrtc/common_video/common_video_gn/moz.build +index 869db500add1..9e5cdb7e6cce 100644 +--- third_party/libwebrtc/common_video/common_video_gn/moz.build ++++ third_party/libwebrtc/common_video/common_video_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -25559,7 +27306,7 @@ index e974486fb73f..6ed2d47ba9a7 100644 FINAL_LIBRARY = "webrtc" -@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -55,183 +64,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -25567,7 +27314,7 @@ index e974486fb73f..6ed2d47ba9a7 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -25577,6 +27324,10 @@ index e974486fb73f..6ed2d47ba9a7 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -25604,6 +27355,7 @@ index e974486fb73f..6ed2d47ba9a7 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -25638,6 +27390,10 @@ index e974486fb73f..6ed2d47ba9a7 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -25654,6 +27410,24 @@ index e974486fb73f..6ed2d47ba9a7 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -25688,10 +27462,10 @@ index e974486fb73f..6ed2d47ba9a7 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -25705,35 +27479,40 @@ index e974486fb73f..6ed2d47ba9a7 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("rtc_constants_gn") -diff --git third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build -index 2b377c439832..1cace339002b 100644 ---- third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build -+++ third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("common_video_gn") +diff --git third_party/libwebrtc/common_video/frame_counts_gn/moz.build third_party/libwebrtc/common_video/frame_counts_gn/moz.build +index 6029016a0e4b..0bd2ab0ab211 100644 +--- third_party/libwebrtc/common_video/frame_counts_gn/moz.build ++++ third_party/libwebrtc/common_video/frame_counts_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -25742,7 +27521,7 @@ index 2b377c439832..1cace339002b 100644 FINAL_LIBRARY = "webrtc" -@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -25750,7 +27529,7 @@ index 2b377c439832..1cace339002b 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -25760,11 +27539,6 @@ index 2b377c439832..1cace339002b 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "GLESv2", -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -25789,14 +27563,10 @@ index 2b377c439832..1cace339002b 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -25831,13 +27601,6 @@ index 2b377c439832..1cace339002b 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -25847,14 +27610,26 @@ index 2b377c439832..1cace339002b 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -25876,9 +27651,10 @@ index 2b377c439832..1cace339002b 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -25887,12 +27663,7 @@ index 2b377c439832..1cace339002b 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -25907,33 +27678,30 @@ index 2b377c439832..1cace339002b 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("rtc_encoder_simulcast_proxy_gn") -diff --git third_party/libwebrtc/media/rtc_h264_profile_id_gn/moz.build third_party/libwebrtc/media/rtc_h264_profile_id_gn/moz.build -index 6844178c6ccc..29eec2b96ff1 100644 ---- third_party/libwebrtc/media/rtc_h264_profile_id_gn/moz.build -+++ third_party/libwebrtc/media/rtc_h264_profile_id_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("frame_counts_gn") +diff --git third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build +index b09e027176e1..0ab69dd829cb 100644 +--- third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build ++++ third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -25942,7 +27710,7 @@ index 6844178c6ccc..29eec2b96ff1 100644 FINAL_LIBRARY = "webrtc" -@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -25950,7 +27718,7 @@ index 6844178c6ccc..29eec2b96ff1 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -25961,7 +27729,6 @@ index 6844178c6ccc..29eec2b96ff1 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -25989,14 +27756,10 @@ index 6844178c6ccc..29eec2b96ff1 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -26031,13 +27794,6 @@ index 6844178c6ccc..29eec2b96ff1 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -26054,6 +27810,24 @@ index 6844178c6ccc..29eec2b96ff1 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -26087,8 +27861,7 @@ index 6844178c6ccc..29eec2b96ff1 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -26106,34 +27879,40 @@ index 6844178c6ccc..29eec2b96ff1 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("rtc_h264_profile_id_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 56ef2c321cfe..114eab3d547f 100644 ---- third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build -+++ third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("generic_frame_descriptor_gn") +diff --git third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build +index 2ae645ea741d..82f547782ab4 100644 +--- third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build ++++ third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -26142,7 +27921,7 @@ index 56ef2c321cfe..114eab3d547f 100644 FINAL_LIBRARY = "webrtc" -@@ -42,173 +51,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -26150,7 +27929,7 @@ index 56ef2c321cfe..114eab3d547f 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -26160,11 +27939,6 @@ index 56ef2c321cfe..114eab3d547f 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "GLESv2", -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -26189,14 +27963,10 @@ index 56ef2c321cfe..114eab3d547f 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -26231,13 +28001,6 @@ index 56ef2c321cfe..114eab3d547f 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -26247,14 +28010,26 @@ index 56ef2c321cfe..114eab3d547f 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -26276,9 +28051,10 @@ index 56ef2c321cfe..114eab3d547f 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -26287,12 +28063,7 @@ index 56ef2c321cfe..114eab3d547f 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -26307,33 +28078,44 @@ index 56ef2c321cfe..114eab3d547f 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("rtc_internal_video_codecs_gn") -diff --git third_party/libwebrtc/media/rtc_media_base_gn/moz.build third_party/libwebrtc/media/rtc_media_base_gn/moz.build -index f1c19c6dd9fe..7f7f4d1a7002 100644 ---- third_party/libwebrtc/media/rtc_media_base_gn/moz.build -+++ third_party/libwebrtc/media/rtc_media_base_gn/moz.build -@@ -11,10 +11,19 @@ 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 2f9f14acb430..f8143d2798f0 100644 +--- third_party/libwebrtc/experiments/registered_field_trials_header_gn/moz.build ++++ third_party/libwebrtc/experiments/registered_field_trials_header_gn/moz.build +@@ -31,9 +31,4 @@ LOCAL_INCLUDES += [ + "/tools/profiler/public" + ] +-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 ddc4a9cc8bdb..76b97cad597b 100644 +--- third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build ++++ third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -26342,7 +28124,7 @@ index f1c19c6dd9fe..7f7f4d1a7002 100644 FINAL_LIBRARY = "webrtc" -@@ -45,173 +54,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -47,183 +56,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -26350,7 +28132,7 @@ index f1c19c6dd9fe..7f7f4d1a7002 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -26361,7 +28143,6 @@ index f1c19c6dd9fe..7f7f4d1a7002 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -26389,14 +28170,10 @@ index f1c19c6dd9fe..7f7f4d1a7002 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -26433,9 +28210,6 @@ index f1c19c6dd9fe..7f7f4d1a7002 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -26454,6 +28228,24 @@ index f1c19c6dd9fe..7f7f4d1a7002 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -26487,8 +28279,7 @@ index f1c19c6dd9fe..7f7f4d1a7002 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -26506,34 +28297,40 @@ index f1c19c6dd9fe..7f7f4d1a7002 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 a9926573ede9..0354b4ba19a1 100644 ---- third_party/libwebrtc/media/rtc_media_config_gn/moz.build -+++ third_party/libwebrtc/media/rtc_media_config_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("rtc_event_audio_gn") +diff --git third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build +index 270182b2be45..48e47598a034 100644 +--- third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build ++++ third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -26542,7 +28339,7 @@ index a9926573ede9..0354b4ba19a1 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -48,183 +57,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -26550,7 +28347,7 @@ index a9926573ede9..0354b4ba19a1 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -26560,6 +28357,10 @@ index a9926573ede9..0354b4ba19a1 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -26587,6 +28388,7 @@ index a9926573ede9..0354b4ba19a1 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -26621,6 +28423,10 @@ index a9926573ede9..0354b4ba19a1 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -26630,9 +28436,31 @@ index a9926573ede9..0354b4ba19a1 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -26667,6 +28495,10 @@ index a9926573ede9..0354b4ba19a1 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -26680,30 +28512,40 @@ index a9926573ede9..0354b4ba19a1 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("rtc_media_config_gn") -diff --git third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build -index ceaa7aec0299..e8e941546b56 100644 ---- third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build -+++ third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 7a816f43289d..9c1a7bd6de3f 100644 +--- third_party/libwebrtc/logging/rtc_event_field_gn/moz.build ++++ third_party/libwebrtc/logging/rtc_event_field_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -26712,7 +28554,7 @@ index ceaa7aec0299..e8e941546b56 100644 FINAL_LIBRARY = "webrtc" -@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,183 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -26720,7 +28562,7 @@ index ceaa7aec0299..e8e941546b56 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -26731,7 +28573,6 @@ index ceaa7aec0299..e8e941546b56 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -26759,14 +28600,10 @@ index ceaa7aec0299..e8e941546b56 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -26803,9 +28640,6 @@ index ceaa7aec0299..e8e941546b56 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -26824,6 +28658,24 @@ index ceaa7aec0299..e8e941546b56 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -26857,8 +28709,7 @@ index ceaa7aec0299..e8e941546b56 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -26876,34 +28727,40 @@ index ceaa7aec0299..e8e941546b56 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("rtc_simulcast_encoder_adapter_gn") -diff --git third_party/libwebrtc/media/rtc_vp9_profile_gn/moz.build third_party/libwebrtc/media/rtc_vp9_profile_gn/moz.build -index ef896d5ff6ee..fe12af945eb1 100644 ---- third_party/libwebrtc/media/rtc_vp9_profile_gn/moz.build -+++ third_party/libwebrtc/media/rtc_vp9_profile_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("rtc_event_field_gn") +diff --git third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build +index ad1c2615454e..7838b57024ae 100644 +--- third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build ++++ third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -26912,7 +28769,7 @@ index ef896d5ff6ee..fe12af945eb1 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,179 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -26920,7 +28777,7 @@ index ef896d5ff6ee..fe12af945eb1 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -26961,6 +28818,7 @@ index ef896d5ff6ee..fe12af945eb1 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -26995,10 +28853,6 @@ index ef896d5ff6ee..fe12af945eb1 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -27015,6 +28869,24 @@ index ef896d5ff6ee..fe12af945eb1 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -27049,10 +28921,10 @@ index ef896d5ff6ee..fe12af945eb1 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -27066,35 +28938,40 @@ index ef896d5ff6ee..fe12af945eb1 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("rtc_vp9_profile_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 2584f7b5b22e..96ccc03c0b2a 100644 ---- third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 a920e8d64332..ffe265db0851 100644 +--- third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build ++++ third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -27103,7 +28980,7 @@ index 2584f7b5b22e..96ccc03c0b2a 100644 FINAL_LIBRARY = "webrtc" -@@ -44,171 +53,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -27111,7 +28988,7 @@ index 2584f7b5b22e..96ccc03c0b2a 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -27149,13 +29026,10 @@ index 2584f7b5b22e..96ccc03c0b2a 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -27192,9 +29066,6 @@ index 2584f7b5b22e..96ccc03c0b2a 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -27213,6 +29084,24 @@ index 2584f7b5b22e..96ccc03c0b2a 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -27246,8 +29135,7 @@ index 2584f7b5b22e..96ccc03c0b2a 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -27265,34 +29153,40 @@ index 2584f7b5b22e..96ccc03c0b2a 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("audio_coding_gn") -diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build -index ff52a5e847a4..a4e5154d2e30 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 bb826e4a720e..b290dc3e72e7 100644 +--- third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build ++++ third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -27301,7 +29195,7 @@ index ff52a5e847a4..a4e5154d2e30 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -27309,7 +29203,7 @@ index ff52a5e847a4..a4e5154d2e30 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -27319,6 +29213,10 @@ index ff52a5e847a4..a4e5154d2e30 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -27343,9 +29241,14 @@ index ff52a5e847a4..a4e5154d2e30 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -27380,6 +29283,13 @@ index ff52a5e847a4..a4e5154d2e30 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -27389,9 +29299,31 @@ index ff52a5e847a4..a4e5154d2e30 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -27426,6 +29358,10 @@ index ff52a5e847a4..a4e5154d2e30 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -27439,30 +29375,40 @@ index ff52a5e847a4..a4e5154d2e30 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 d937e61e646e..9e00d72094ad 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 423abc9ec40c..cf444b4316cd 100644 +--- third_party/libwebrtc/logging/rtc_event_video_gn/moz.build ++++ third_party/libwebrtc/logging/rtc_event_video_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -27471,7 +29417,7 @@ index d937e61e646e..9e00d72094ad 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -27479,7 +29425,7 @@ index d937e61e646e..9e00d72094ad 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -27520,6 +29466,7 @@ index d937e61e646e..9e00d72094ad 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -27574,6 +29521,24 @@ index d937e61e646e..9e00d72094ad 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -27608,10 +29573,10 @@ index d937e61e646e..9e00d72094ad 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -27625,35 +29590,40 @@ index d937e61e646e..9e00d72094ad 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("audio_coding_opus_common_gn") -diff --git third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build -index d1a7bb0c2343..5b02f56d0388 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("rtc_event_video_gn") +diff --git third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build +index 14ba953e29d3..96ef93e69179 100644 +--- third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build ++++ third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -27662,7 +29632,7 @@ index d1a7bb0c2343..5b02f56d0388 100644 FINAL_LIBRARY = "webrtc" -@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -27670,7 +29640,7 @@ index d1a7bb0c2343..5b02f56d0388 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -27708,13 +29678,10 @@ index d1a7bb0c2343..5b02f56d0388 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -27751,9 +29718,6 @@ index d1a7bb0c2343..5b02f56d0388 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -27772,6 +29736,24 @@ index d1a7bb0c2343..5b02f56d0388 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -27805,8 +29787,7 @@ index d1a7bb0c2343..5b02f56d0388 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -27824,34 +29805,40 @@ index d1a7bb0c2343..5b02f56d0388 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("audio_encoder_cng_gn") -diff --git third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build -index 571034c095bf..d380fdacde8d 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("rtc_stream_config_gn") +diff --git third_party/libwebrtc/media/codec_gn/moz.build third_party/libwebrtc/media/codec_gn/moz.build +index 6b56a082191f..f5bac588d11b 100644 +--- third_party/libwebrtc/media/codec_gn/moz.build ++++ third_party/libwebrtc/media/codec_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -27860,7 +29847,7 @@ index 571034c095bf..d380fdacde8d 100644 FINAL_LIBRARY = "webrtc" -@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -27868,7 +29855,7 @@ index 571034c095bf..d380fdacde8d 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -27878,6 +29865,10 @@ index 571034c095bf..d380fdacde8d 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -27905,6 +29896,7 @@ index 571034c095bf..d380fdacde8d 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -27939,6 +29931,10 @@ index 571034c095bf..d380fdacde8d 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -27955,6 +29951,24 @@ index 571034c095bf..d380fdacde8d 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -27989,10 +30003,10 @@ index 571034c095bf..d380fdacde8d 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -28006,35 +30020,40 @@ index 571034c095bf..d380fdacde8d 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("audio_network_adaptor_config_gn") -diff --git third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build -index 83b98d03b4e4..47f9372a3758 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("codec_gn") +diff --git third_party/libwebrtc/media/delayable_gn/moz.build third_party/libwebrtc/media/delayable_gn/moz.build +index 12b25ac016e3..3a95f5ef1faf 100644 +--- third_party/libwebrtc/media/delayable_gn/moz.build ++++ third_party/libwebrtc/media/delayable_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -28043,7 +30062,7 @@ index 83b98d03b4e4..47f9372a3758 100644 FINAL_LIBRARY = "webrtc" -@@ -50,171 +59,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -28051,7 +30070,7 @@ index 83b98d03b4e4..47f9372a3758 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -28061,10 +30080,6 @@ index 83b98d03b4e4..47f9372a3758 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -28089,13 +30104,10 @@ index 83b98d03b4e4..47f9372a3758 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -28130,13 +30142,6 @@ index 83b98d03b4e4..47f9372a3758 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -28146,14 +30151,26 @@ index 83b98d03b4e4..47f9372a3758 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -28175,9 +30192,10 @@ index 83b98d03b4e4..47f9372a3758 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -28186,12 +30204,7 @@ index 83b98d03b4e4..47f9372a3758 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -28206,33 +30219,30 @@ index 83b98d03b4e4..47f9372a3758 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("audio_network_adaptor_gn") -diff --git third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build -index b3cba7d919b2..cd006b3d12d1 100644 ---- third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("delayable_gn") +diff --git third_party/libwebrtc/media/media_channel_gn/moz.build third_party/libwebrtc/media/media_channel_gn/moz.build +index d031085023fb..863e7fde7105 100644 +--- third_party/libwebrtc/media/media_channel_gn/moz.build ++++ third_party/libwebrtc/media/media_channel_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -28241,7 +30251,7 @@ index b3cba7d919b2..cd006b3d12d1 100644 FINAL_LIBRARY = "webrtc" -@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -28249,7 +30259,7 @@ index b3cba7d919b2..cd006b3d12d1 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -28260,6 +30270,7 @@ index b3cba7d919b2..cd006b3d12d1 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ +- "GLESv2", - "log" - ] - @@ -28294,6 +30305,7 @@ index b3cba7d919b2..cd006b3d12d1 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -28344,14 +30356,26 @@ index b3cba7d919b2..cd006b3d12d1 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -161,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -28373,9 +30397,10 @@ index b3cba7d919b2..cd006b3d12d1 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -28384,12 +30409,7 @@ index b3cba7d919b2..cd006b3d12d1 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -28404,33 +30424,30 @@ index b3cba7d919b2..cd006b3d12d1 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("default_neteq_factory_gn") -diff --git third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build -index e3c1102d8d09..adb7ec292829 100644 ---- third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("media_channel_gn") +diff --git third_party/libwebrtc/media/media_channel_impl_gn/moz.build third_party/libwebrtc/media/media_channel_impl_gn/moz.build +index 49b90be2fc51..7f0b3bc10a7f 100644 +--- third_party/libwebrtc/media/media_channel_impl_gn/moz.build ++++ third_party/libwebrtc/media/media_channel_impl_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -28439,7 +30456,7 @@ index e3c1102d8d09..adb7ec292829 100644 FINAL_LIBRARY = "webrtc" -@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -28447,7 +30464,7 @@ index e3c1102d8d09..adb7ec292829 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -28484,6 +30501,7 @@ index e3c1102d8d09..adb7ec292829 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -28527,14 +30545,26 @@ index e3c1102d8d09..adb7ec292829 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -28556,9 +30586,10 @@ index e3c1102d8d09..adb7ec292829 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -28568,10 +30599,6 @@ index e3c1102d8d09..adb7ec292829 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -28585,35 +30612,31 @@ index e3c1102d8d09..adb7ec292829 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("g711_c_gn") -diff --git third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build -index 6b7718168b4e..4fcf33548fad 100644 ---- third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("media_channel_impl_gn") +diff --git third_party/libwebrtc/media/media_constants_gn/moz.build third_party/libwebrtc/media/media_constants_gn/moz.build +index fb30505356f2..28762fdde6a3 100644 +--- third_party/libwebrtc/media/media_constants_gn/moz.build ++++ third_party/libwebrtc/media/media_constants_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -28622,7 +30645,7 @@ index 6b7718168b4e..4fcf33548fad 100644 FINAL_LIBRARY = "webrtc" -@@ -41,164 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -28630,7 +30653,7 @@ index 6b7718168b4e..4fcf33548fad 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -28640,10 +30663,6 @@ index 6b7718168b4e..4fcf33548fad 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -28671,6 +30690,7 @@ index 6b7718168b4e..4fcf33548fad 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -28705,10 +30725,6 @@ index 6b7718168b4e..4fcf33548fad 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -28725,6 +30741,24 @@ index 6b7718168b4e..4fcf33548fad 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -28759,10 +30793,10 @@ index 6b7718168b4e..4fcf33548fad 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -28776,35 +30810,40 @@ index 6b7718168b4e..4fcf33548fad 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("g711_gn") -diff --git third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build -index 3fc0bef73618..ff658fd5f220 100644 ---- third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("media_constants_gn") +diff --git third_party/libwebrtc/media/rid_description_gn/moz.build third_party/libwebrtc/media/rid_description_gn/moz.build +index 73ebe8374986..c11ccc5b2902 100644 +--- third_party/libwebrtc/media/rid_description_gn/moz.build ++++ third_party/libwebrtc/media/rid_description_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -28813,7 +30852,7 @@ index 3fc0bef73618..ff658fd5f220 100644 FINAL_LIBRARY = "webrtc" -@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -28821,7 +30860,7 @@ index 3fc0bef73618..ff658fd5f220 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -28858,6 +30897,7 @@ index 3fc0bef73618..ff658fd5f220 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -28901,14 +30941,26 @@ index 3fc0bef73618..ff658fd5f220 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -28930,9 +30982,10 @@ index 3fc0bef73618..ff658fd5f220 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -28942,10 +30995,6 @@ index 3fc0bef73618..ff658fd5f220 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -28959,35 +31008,31 @@ index 3fc0bef73618..ff658fd5f220 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("g722_c_gn") -diff --git third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build -index d7d25e6fb410..48204da0acde 100644 ---- third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("rid_description_gn") +diff --git third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build +index 040f27525274..f16bd9e3d193 100644 +--- third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build ++++ third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -28996,7 +31041,7 @@ index d7d25e6fb410..48204da0acde 100644 FINAL_LIBRARY = "webrtc" -@@ -41,164 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -29004,7 +31049,7 @@ index d7d25e6fb410..48204da0acde 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -29015,6 +31060,7 @@ index d7d25e6fb410..48204da0acde 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ +- "GLESv2", - "log" - ] - @@ -29042,9 +31088,14 @@ index d7d25e6fb410..48204da0acde 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -29081,6 +31132,9 @@ index d7d25e6fb410..48204da0acde 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -29099,6 +31153,24 @@ index d7d25e6fb410..48204da0acde 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -29133,10 +31205,10 @@ index d7d25e6fb410..48204da0acde 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -29150,35 +31222,40 @@ index d7d25e6fb410..48204da0acde 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("g722_gn") -diff --git third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build -index 6d94e676bf69..7b6412d996cb 100644 ---- third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("rtc_encoder_simulcast_proxy_gn") +diff --git third_party/libwebrtc/media/rtc_media_base_gn/moz.build third_party/libwebrtc/media/rtc_media_base_gn/moz.build +index a48b9886dd24..fcc31ea11376 100644 +--- third_party/libwebrtc/media/rtc_media_base_gn/moz.build ++++ third_party/libwebrtc/media/rtc_media_base_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -29187,7 +31264,7 @@ index 6d94e676bf69..7b6412d996cb 100644 FINAL_LIBRARY = "webrtc" -@@ -108,171 +117,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,191 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -29195,7 +31272,7 @@ index 6d94e676bf69..7b6412d996cb 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -29206,6 +31283,7 @@ index 6d94e676bf69..7b6412d996cb 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ +- "GLESv2", - "log" - ] - @@ -29240,6 +31318,7 @@ index 6d94e676bf69..7b6412d996cb 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -29290,13 +31369,31 @@ index 6d94e676bf69..7b6412d996cb 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CFLAGS += [ +- CXXFLAGS += [ - "-mfpu=neon" - ] - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -29330,9 +31427,8 @@ index 6d94e676bf69..7b6412d996cb 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CFLAGS += [ +- + CXXFLAGS += [ "-msse2" ] @@ -29349,34 +31445,40 @@ index 6d94e676bf69..7b6412d996cb 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- -- CFLAGS += [ ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("ilbc_c_gn") -diff --git third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build -index 5fce348d4824..273799c130e0 100644 ---- third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 568632c48fb8..94c43caef47b 100644 +--- third_party/libwebrtc/media/rtc_media_config_gn/moz.build ++++ third_party/libwebrtc/media/rtc_media_config_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -29385,7 +31487,7 @@ index 5fce348d4824..273799c130e0 100644 FINAL_LIBRARY = "webrtc" -@@ -41,171 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -29393,7 +31495,7 @@ index 5fce348d4824..273799c130e0 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -29403,10 +31505,6 @@ index 5fce348d4824..273799c130e0 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -29431,13 +31529,10 @@ index 5fce348d4824..273799c130e0 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -29472,13 +31567,6 @@ index 5fce348d4824..273799c130e0 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -29488,14 +31576,26 @@ index 5fce348d4824..273799c130e0 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -29517,9 +31617,10 @@ index 5fce348d4824..273799c130e0 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -29528,12 +31629,7 @@ index 5fce348d4824..273799c130e0 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -29548,33 +31644,30 @@ index 5fce348d4824..273799c130e0 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("ilbc_gn") -diff --git third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build -index 0683c6b2c87f..7957e160f1cf 100644 ---- third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("rtc_media_config_gn") +diff --git third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build +index 4293ba6d9066..01eda12bd559 100644 +--- third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build ++++ third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -29583,7 +31676,7 @@ index 0683c6b2c87f..7957e160f1cf 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -29591,7 +31684,7 @@ index 0683c6b2c87f..7957e160f1cf 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -29601,6 +31694,11 @@ index 0683c6b2c87f..7957e160f1cf 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "GLESv2", +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -29625,9 +31723,14 @@ index 0683c6b2c87f..7957e160f1cf 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -29662,6 +31765,13 @@ index 0683c6b2c87f..7957e160f1cf 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -29671,9 +31781,31 @@ index 0683c6b2c87f..7957e160f1cf 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -29708,6 +31840,10 @@ index 0683c6b2c87f..7957e160f1cf 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -29721,30 +31857,40 @@ index 0683c6b2c87f..7957e160f1cf 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("isac_bwinfo_gn") -diff --git third_party/libwebrtc/modules/audio_coding/isac_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_c_gn/moz.build -index eb1ef5acdda3..5e9603ecac08 100644 ---- third_party/libwebrtc/modules/audio_coding/isac_c_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/isac_c_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 d12f755865a5..a5d44da104b6 100644 +--- third_party/libwebrtc/media/rtp_utils_gn/moz.build ++++ third_party/libwebrtc/media/rtp_utils_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -29753,7 +31899,7 @@ index eb1ef5acdda3..5e9603ecac08 100644 FINAL_LIBRARY = "webrtc" -@@ -62,151 +71,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -29761,7 +31907,7 @@ index eb1ef5acdda3..5e9603ecac08 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -29771,10 +31917,6 @@ index eb1ef5acdda3..5e9603ecac08 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -29799,14 +31941,10 @@ index eb1ef5acdda3..5e9603ecac08 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "m", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -29841,13 +31979,6 @@ index eb1ef5acdda3..5e9603ecac08 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -29855,6 +31986,28 @@ index eb1ef5acdda3..5e9603ecac08 100644 DEFINES["WEBRTC_ARCH_ARM64"] = True DEFINES["WEBRTC_HAS_NEON"] = True +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -29876,16 +32029,19 @@ index eb1ef5acdda3..5e9603ecac08 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - -- DEFINES["USE_X11"] = "1" +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -29894,11 +32050,11 @@ index eb1ef5acdda3..5e9603ecac08 100644 - - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- CFLAGS += [ -- "-msse2" -- ] +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - @@ -29906,23 +32062,24 @@ index eb1ef5acdda3..5e9603ecac08 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("isac_c_gn") -diff --git third_party/libwebrtc/modules/audio_coding/isac_common_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_common_gn/moz.build -index c0022a8ed181..376fa6e9ca1b 100644 ---- third_party/libwebrtc/modules/audio_coding/isac_common_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/isac_common_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("rtp_utils_gn") +diff --git third_party/libwebrtc/media/stream_params_gn/moz.build third_party/libwebrtc/media/stream_params_gn/moz.build +index 2deba906b932..65ec7aef0025 100644 +--- third_party/libwebrtc/media/stream_params_gn/moz.build ++++ third_party/libwebrtc/media/stream_params_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -29931,7 +32088,7 @@ index c0022a8ed181..376fa6e9ca1b 100644 FINAL_LIBRARY = "webrtc" -@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -29939,7 +32096,7 @@ index c0022a8ed181..376fa6e9ca1b 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -29949,10 +32106,6 @@ index c0022a8ed181..376fa6e9ca1b 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -29980,6 +32133,7 @@ index c0022a8ed181..376fa6e9ca1b 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -30014,10 +32168,6 @@ index c0022a8ed181..376fa6e9ca1b 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -30031,6 +32181,22 @@ index c0022a8ed181..376fa6e9ca1b 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -30052,9 +32218,10 @@ index c0022a8ed181..376fa6e9ca1b 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -30084,23 +32251,24 @@ index c0022a8ed181..376fa6e9ca1b 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("isac_common_gn") -diff --git third_party/libwebrtc/modules/audio_coding/isac_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_gn/moz.build -index fb8bd4934a8a..1e34d436dfaa 100644 ---- third_party/libwebrtc/modules/audio_coding/isac_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/isac_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("stream_params_gn") +diff --git third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build +index f599fadae2f0..90a52e406005 100644 +--- third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build ++++ third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -30109,7 +32277,7 @@ index fb8bd4934a8a..1e34d436dfaa 100644 FINAL_LIBRARY = "webrtc" -@@ -41,151 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -30117,7 +32285,7 @@ index fb8bd4934a8a..1e34d436dfaa 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -30155,14 +32323,10 @@ index fb8bd4934a8a..1e34d436dfaa 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "m", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -30199,9 +32363,6 @@ index fb8bd4934a8a..1e34d436dfaa 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -30211,6 +32372,34 @@ index fb8bd4934a8a..1e34d436dfaa 100644 DEFINES["WEBRTC_ARCH_ARM64"] = True DEFINES["WEBRTC_HAS_NEON"] = True +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -30235,9 +32424,15 @@ index fb8bd4934a8a..1e34d436dfaa 100644 - - DEFINES["USE_X11"] = "1" - +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -30250,35 +32445,45 @@ index fb8bd4934a8a..1e34d436dfaa 100644 - - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True - +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("isac_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 32e0bdbeae79..225a9395949a 100644 ---- third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 03d99c93b89a..a1a7c66b6ff0 100644 +--- third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -30287,7 +32492,7 @@ index 32e0bdbeae79..225a9395949a 100644 FINAL_LIBRARY = "webrtc" -@@ -43,156 +52,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -47,190 +56,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -30295,7 +32500,7 @@ index 32e0bdbeae79..225a9395949a 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -30305,6 +32510,10 @@ index 32e0bdbeae79..225a9395949a 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -30329,9 +32538,14 @@ index 32e0bdbeae79..225a9395949a 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -30366,6 +32580,13 @@ index 32e0bdbeae79..225a9395949a 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -30375,13 +32596,31 @@ index 32e0bdbeae79..225a9395949a 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CFLAGS += [ +- CXXFLAGS += [ - "-mfpu=neon" - ] - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -30416,10 +32655,10 @@ index 32e0bdbeae79..225a9395949a 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -30433,35 +32672,40 @@ index 32e0bdbeae79..225a9395949a 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 18350301d248..00bcac5bbb50 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 2826ed8642f9..e8194cf79b99 100644 +--- third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -30470,7 +32714,7 @@ index 18350301d248..00bcac5bbb50 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -30478,7 +32722,7 @@ index 18350301d248..00bcac5bbb50 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -30488,10 +32732,6 @@ index 18350301d248..00bcac5bbb50 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -30519,6 +32759,7 @@ index 18350301d248..00bcac5bbb50 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -30553,10 +32794,6 @@ index 18350301d248..00bcac5bbb50 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -30566,14 +32803,26 @@ index 18350301d248..00bcac5bbb50 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -30595,9 +32844,10 @@ index 18350301d248..00bcac5bbb50 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -30607,10 +32857,6 @@ index 18350301d248..00bcac5bbb50 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -30624,35 +32870,31 @@ index 18350301d248..00bcac5bbb50 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = 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 12652118fcd3..2e1db1d17b5b 100644 ---- third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("audio_coding_module_typedefs_gn") +diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build +index bf852e8442a4..de2e04dffe32 100644 +--- third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -30661,7 +32903,7 @@ index 12652118fcd3..2e1db1d17b5b 100644 FINAL_LIBRARY = "webrtc" -@@ -72,171 +81,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -30669,7 +32911,7 @@ index 12652118fcd3..2e1db1d17b5b 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -30707,13 +32949,10 @@ index 12652118fcd3..2e1db1d17b5b 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -30750,9 +32989,6 @@ index 12652118fcd3..2e1db1d17b5b 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -30771,6 +33007,24 @@ index 12652118fcd3..2e1db1d17b5b 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -30804,8 +33058,7 @@ index 12652118fcd3..2e1db1d17b5b 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -30823,34 +33076,40 @@ index 12652118fcd3..2e1db1d17b5b 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 0e1653a5e920..754b01f3934f 100644 ---- third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 56b6d50f6cb7..7ef50512ec05 100644 +--- third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -30859,7 +33118,7 @@ index 0e1653a5e920..754b01f3934f 100644 FINAL_LIBRARY = "webrtc" -@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -30867,7 +33126,7 @@ index 0e1653a5e920..754b01f3934f 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -30877,6 +33136,10 @@ index 0e1653a5e920..754b01f3934f 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -30901,9 +33164,14 @@ index 0e1653a5e920..754b01f3934f 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -30938,6 +33206,13 @@ index 0e1653a5e920..754b01f3934f 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -30947,13 +33222,31 @@ index 0e1653a5e920..754b01f3934f 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CFLAGS += [ +- CXXFLAGS += [ - "-mfpu=neon" - ] - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -30988,10 +33281,10 @@ index 0e1653a5e920..754b01f3934f 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -31005,35 +33298,40 @@ index 0e1653a5e920..754b01f3934f 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 9672bdd6e442..6d03ec66d70c 100644 ---- third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("audio_encoder_cng_gn") +diff --git third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build +index 37cf81ad9f54..a17cc5124685 100644 +--- third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -31042,7 +33340,7 @@ index 9672bdd6e442..6d03ec66d70c 100644 FINAL_LIBRARY = "webrtc" -@@ -42,164 +51,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -31050,7 +33348,7 @@ index 9672bdd6e442..6d03ec66d70c 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -31060,10 +33358,6 @@ index 9672bdd6e442..6d03ec66d70c 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -31091,6 +33385,7 @@ index 9672bdd6e442..6d03ec66d70c 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -31125,10 +33420,6 @@ index 9672bdd6e442..6d03ec66d70c 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -31145,6 +33436,24 @@ index 9672bdd6e442..6d03ec66d70c 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -31179,10 +33488,10 @@ index 9672bdd6e442..6d03ec66d70c 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -31196,35 +33505,40 @@ index 9672bdd6e442..6d03ec66d70c 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 78fa81b88eb3..e7f3708a383b 100644 ---- third_party/libwebrtc/modules/audio_coding/red_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/red_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 1d0905ebc109..ba348ebeecff 100644 +--- third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -31233,7 +33547,7 @@ index 78fa81b88eb3..e7f3708a383b 100644 FINAL_LIBRARY = "webrtc" -@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -53,190 +62,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -31241,7 +33555,7 @@ index 78fa81b88eb3..e7f3708a383b 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -31286,6 +33600,7 @@ index 78fa81b88eb3..e7f3708a383b 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -31343,6 +33658,24 @@ index 78fa81b88eb3..e7f3708a383b 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -31376,8 +33709,7 @@ index 78fa81b88eb3..e7f3708a383b 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -31395,34 +33727,40 @@ index 78fa81b88eb3..e7f3708a383b 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 9bc743df7706..199c59179266 100644 ---- third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("audio_network_adaptor_gn") +diff --git third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build +index 206a4ae313fd..145619c84116 100644 +--- third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -31431,7 +33769,7 @@ index 9bc743df7706..199c59179266 100644 FINAL_LIBRARY = "webrtc" -@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -31439,7 +33777,7 @@ index 9bc743df7706..199c59179266 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -31484,6 +33822,7 @@ index 9bc743df7706..199c59179266 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -31541,6 +33880,24 @@ index 9bc743df7706..199c59179266 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -31574,8 +33931,7 @@ index 9bc743df7706..199c59179266 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -31593,38 +33949,40 @@ index 9bc743df7706..199c59179266 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 4d11b7c7a093..3eb4470df234 100644 ---- third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build -@@ -11,13 +11,23 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("default_neteq_factory_gn") +diff --git third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build +index 8322910094eb..7bfe819841af 100644 +--- third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_CODEC_ILBC"] = True -+DEFINES["WEBRTC_CODEC_ISAC"] = True - DEFINES["WEBRTC_CODEC_OPUS"] = 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_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 @@ -31633,7 +33991,7 @@ index 4d11b7c7a093..3eb4470df234 100644 FINAL_LIBRARY = "webrtc" -@@ -45,185 +55,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -31641,7 +33999,7 @@ index 4d11b7c7a093..3eb4470df234 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -31651,13 +34009,8 @@ index 4d11b7c7a093..3eb4470df234 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_CODEC_ISAC"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -31683,9 +34036,9 @@ index 4d11b7c7a093..3eb4470df234 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_CODEC_ISAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -31701,7 +34054,6 @@ index 4d11b7c7a093..3eb4470df234 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_CODEC_ISAC"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -31719,10 +34071,6 @@ index 4d11b7c7a093..3eb4470df234 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -31732,18 +34080,31 @@ index 4d11b7c7a093..3eb4470df234 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ +- CFLAGS += [ - "-mfpu=neon" - ] - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_CODEC_ISACFX"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "ppc64": + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": - -- DEFINES["WEBRTC_CODEC_ISAC"] = True +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -31769,10 +34130,6 @@ index 4d11b7c7a093..3eb4470df234 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["WEBRTC_CODEC_ISAC"] = True -- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -31781,25 +34138,17 @@ index 4d11b7c7a093..3eb4470df234 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ +- + CFLAGS += [ "-msse2" ] -- DEFINES["WEBRTC_CODEC_ISAC"] = True -- - OS_LIBS += [ - "android_support" - ] - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["WEBRTC_CODEC_ISAC"] = True -- -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_CODEC_ISAC"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": @@ -31807,40 +34156,40 @@ index 4d11b7c7a093..3eb4470df234 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- -- CXXFLAGS += [ ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_CODEC_ISAC"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_CODEC_ISAC"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 b3eddbf6d7e2..a32b4ffb35b1 100644 ---- third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build -+++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build -@@ -11,13 +11,23 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 3a21cddc41e2..80e618a7fa10 100644 +--- third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_CODEC_ILBC"] = True -+DEFINES["WEBRTC_CODEC_ISAC"] = True - DEFINES["WEBRTC_CODEC_OPUS"] = 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_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 @@ -31849,7 +34198,7 @@ index b3eddbf6d7e2..a32b4ffb35b1 100644 FINAL_LIBRARY = "webrtc" -@@ -45,192 +55,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -31857,7 +34206,7 @@ index b3eddbf6d7e2..a32b4ffb35b1 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -31873,7 +34222,6 @@ index b3eddbf6d7e2..a32b4ffb35b1 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_CODEC_ISAC"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -31896,16 +34244,12 @@ index b3eddbf6d7e2..a32b4ffb35b1 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_CODEC_ISAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -31921,7 +34265,6 @@ index b3eddbf6d7e2..a32b4ffb35b1 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_CODEC_ISAC"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -31941,9 +34284,6 @@ index b3eddbf6d7e2..a32b4ffb35b1 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -31961,12 +34301,25 @@ index b3eddbf6d7e2..a32b4ffb35b1 100644 - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_CODEC_ISACFX"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "ppc64": + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": - -- DEFINES["WEBRTC_CODEC_ISAC"] = True +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -31992,10 +34345,6 @@ index b3eddbf6d7e2..a32b4ffb35b1 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["WEBRTC_CODEC_ISAC"] = True -- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -32005,23 +34354,16 @@ index b3eddbf6d7e2..a32b4ffb35b1 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- -- DEFINES["WEBRTC_CODEC_ISAC"] = True -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["WEBRTC_CODEC_ISAC"] = True -- -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_CODEC_ISAC"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": @@ -32029,41 +34371,40 @@ index b3eddbf6d7e2..a32b4ffb35b1 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_CODEC_ISAC"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_CODEC_ISAC"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 0a9b82df14c1..29f3b1af626d 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 -@@ -11,13 +11,23 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("g711_gn") +diff --git third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build +index dc05788b8021..add81cce3212 100644 +--- third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_CODEC_ILBC"] = True -+DEFINES["WEBRTC_CODEC_ISAC"] = True - DEFINES["WEBRTC_CODEC_OPUS"] = 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_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 @@ -32072,7 +34413,7 @@ index 0a9b82df14c1..29f3b1af626d 100644 FINAL_LIBRARY = "webrtc" -@@ -44,185 +54,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -32080,7 +34421,7 @@ index 0a9b82df14c1..29f3b1af626d 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -32090,13 +34431,8 @@ index 0a9b82df14c1..29f3b1af626d 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_CODEC_ISAC"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -32122,9 +34458,9 @@ index 0a9b82df14c1..29f3b1af626d 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_CODEC_ISAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -32140,7 +34476,6 @@ index 0a9b82df14c1..29f3b1af626d 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_CODEC_ISAC"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -32158,10 +34493,6 @@ index 0a9b82df14c1..29f3b1af626d 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -32171,18 +34502,31 @@ index 0a9b82df14c1..29f3b1af626d 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ +- CFLAGS += [ - "-mfpu=neon" - ] - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_CODEC_ISACFX"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "ppc64": + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": - -- DEFINES["WEBRTC_CODEC_ISAC"] = True +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -32208,10 +34552,6 @@ index 0a9b82df14c1..29f3b1af626d 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["WEBRTC_CODEC_ISAC"] = True -- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -32220,25 +34560,17 @@ index 0a9b82df14c1..29f3b1af626d 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ +- + CFLAGS += [ "-msse2" ] -- DEFINES["WEBRTC_CODEC_ISAC"] = True -- - OS_LIBS += [ - "android_support" - ] - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["WEBRTC_CODEC_ISAC"] = True -- -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_CODEC_ISAC"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": @@ -32246,36 +34578,40 @@ index 0a9b82df14c1..29f3b1af626d 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- -- CXXFLAGS += [ ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_CODEC_ISAC"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_CODEC_ISAC"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("webrtc_opus_wrapper_gn") -diff --git third_party/libwebrtc/modules/audio_device/audio_device_api_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_api_gn/moz.build -index 398c2da306fc..d84c8dfb7952 100644 ---- third_party/libwebrtc/modules/audio_device/audio_device_api_gn/moz.build -+++ third_party/libwebrtc/modules/audio_device/audio_device_api_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("g722_c_gn") +diff --git third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build +index 910eef267ffc..d53536655acd 100644 +--- third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -32284,7 +34620,7 @@ index 398c2da306fc..d84c8dfb7952 100644 FINAL_LIBRARY = "webrtc" -@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -32292,7 +34628,7 @@ index 398c2da306fc..d84c8dfb7952 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -32333,6 +34669,7 @@ index 398c2da306fc..d84c8dfb7952 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -32380,9 +34717,31 @@ index 398c2da306fc..d84c8dfb7952 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -32417,6 +34776,10 @@ index 398c2da306fc..d84c8dfb7952 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -32430,30 +34793,40 @@ index 398c2da306fc..d84c8dfb7952 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("audio_device_api_gn") -diff --git third_party/libwebrtc/modules/audio_device/audio_device_buffer_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_buffer_gn/moz.build -index 1195b231c063..c7d7a8f581a8 100644 ---- third_party/libwebrtc/modules/audio_device/audio_device_buffer_gn/moz.build -+++ third_party/libwebrtc/modules/audio_device/audio_device_buffer_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("g722_gn") +diff --git third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build +index 1ff9bdf07a4b..9871fbb1c38f 100644 +--- third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -32462,7 +34835,7 @@ index 1195b231c063..c7d7a8f581a8 100644 FINAL_LIBRARY = "webrtc" -@@ -41,171 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -111,190 +120,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -32470,7 +34843,7 @@ index 1195b231c063..c7d7a8f581a8 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -32515,6 +34888,7 @@ index 1195b231c063..c7d7a8f581a8 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -32565,13 +34939,31 @@ index 1195b231c063..c7d7a8f581a8 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ +- CFLAGS += [ - "-mfpu=neon" - ] - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -32605,9 +34997,8 @@ index 1195b231c063..c7d7a8f581a8 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ +- + CFLAGS += [ "-msse2" ] @@ -32624,34 +35015,40 @@ index 1195b231c063..c7d7a8f581a8 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- -- CXXFLAGS += [ ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("audio_device_buffer_gn") -diff --git third_party/libwebrtc/modules/audio_device/audio_device_default_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_default_gn/moz.build -index 724e242ca3ef..cc391e065472 100644 ---- third_party/libwebrtc/modules/audio_device/audio_device_default_gn/moz.build -+++ third_party/libwebrtc/modules/audio_device/audio_device_default_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("ilbc_c_gn") +diff --git third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build +index 4a7279386ee5..b1811c428dda 100644 +--- third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -32660,7 +35057,7 @@ index 724e242ca3ef..cc391e065472 100644 FINAL_LIBRARY = "webrtc" -@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -32668,7 +35065,7 @@ index 724e242ca3ef..cc391e065472 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -32706,9 +35103,14 @@ index 724e242ca3ef..cc391e065472 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -32745,6 +35147,9 @@ index 724e242ca3ef..cc391e065472 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -32756,9 +35161,31 @@ index 724e242ca3ef..cc391e065472 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -32793,6 +35220,10 @@ index 724e242ca3ef..cc391e065472 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -32806,30 +35237,40 @@ index 724e242ca3ef..cc391e065472 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("audio_device_default_gn") -diff --git third_party/libwebrtc/modules/audio_device/audio_device_generic_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_generic_gn/moz.build -index f08e5c8e02b8..c446d2a6b6d2 100644 ---- third_party/libwebrtc/modules/audio_device/audio_device_generic_gn/moz.build -+++ third_party/libwebrtc/modules/audio_device/audio_device_generic_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("ilbc_gn") +diff --git third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build +index bb9cdf4460c3..00d886763be2 100644 +--- third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -32838,7 +35279,7 @@ index f08e5c8e02b8..c446d2a6b6d2 100644 FINAL_LIBRARY = "webrtc" -@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -32846,7 +35287,7 @@ index f08e5c8e02b8..c446d2a6b6d2 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -32856,10 +35297,6 @@ index f08e5c8e02b8..c446d2a6b6d2 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -32884,13 +35321,10 @@ index f08e5c8e02b8..c446d2a6b6d2 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -32925,13 +35359,6 @@ index f08e5c8e02b8..c446d2a6b6d2 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -32941,14 +35368,26 @@ index f08e5c8e02b8..c446d2a6b6d2 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -32970,9 +35409,10 @@ index f08e5c8e02b8..c446d2a6b6d2 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -32981,12 +35421,7 @@ index f08e5c8e02b8..c446d2a6b6d2 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -33001,33 +35436,30 @@ index f08e5c8e02b8..c446d2a6b6d2 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("audio_device_generic_gn") -diff --git third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build -index 0cfaae2eb2e9..be388a2ff7a8 100644 ---- third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build -+++ third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("isac_bwinfo_gn") +diff --git third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build +index 86f566663ad5..dbed4ddcb476 100644 +--- third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -33036,7 +35468,7 @@ index 0cfaae2eb2e9..be388a2ff7a8 100644 FINAL_LIBRARY = "webrtc" -@@ -36,161 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,175 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -33044,7 +35476,7 @@ index 0cfaae2eb2e9..be388a2ff7a8 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -33054,11 +35486,6 @@ index 0cfaae2eb2e9..be388a2ff7a8 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "GLESv2", -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -33083,14 +35510,10 @@ index 0cfaae2eb2e9..be388a2ff7a8 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -33125,13 +35548,6 @@ index 0cfaae2eb2e9..be388a2ff7a8 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -33141,9 +35557,31 @@ index 0cfaae2eb2e9..be388a2ff7a8 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -33178,6 +35616,10 @@ index 0cfaae2eb2e9..be388a2ff7a8 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -33191,31 +35633,40 @@ index 0cfaae2eb2e9..be388a2ff7a8 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("audio_device_gn") -diff --git third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.build -index 1f4c26e74a73..29823c0077d0 100644 ---- third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.build -+++ third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.build -@@ -11,11 +11,20 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("isac_vad_gn") +diff --git third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build +index b642ffbe952b..9c04c9bb3900 100644 +--- third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_DUMMY_AUDIO_BUILD"] = 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 @@ -33224,7 +35675,7 @@ index 1f4c26e74a73..29823c0077d0 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +52,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -33232,7 +35683,7 @@ index 1f4c26e74a73..29823c0077d0 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -33243,7 +35694,6 @@ index 1f4c26e74a73..29823c0077d0 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -33271,14 +35721,10 @@ index 1f4c26e74a73..29823c0077d0 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -33315,9 +35761,6 @@ index 1f4c26e74a73..29823c0077d0 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -33336,6 +35779,24 @@ index 1f4c26e74a73..29823c0077d0 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -33369,8 +35830,7 @@ index 1f4c26e74a73..29823c0077d0 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -33388,34 +35848,40 @@ index 1f4c26e74a73..29823c0077d0 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("audio_device_impl_gn") -diff --git third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build -index f514687c3e94..e876d26535ec 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 823aea6ddaa0..ecf6b3b2fde3 100644 +--- third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -33424,7 +35890,7 @@ index f514687c3e94..e876d26535ec 100644 FINAL_LIBRARY = "webrtc" -@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -78,190 +87,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -33432,7 +35898,7 @@ index f514687c3e94..e876d26535ec 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -33477,6 +35943,7 @@ index f514687c3e94..e876d26535ec 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -33534,6 +36001,24 @@ index f514687c3e94..e876d26535ec 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -33567,8 +36052,7 @@ index f514687c3e94..e876d26535ec 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -33586,35 +36070,40 @@ index f514687c3e94..e876d26535ec 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 65eb95889500..a65ae523f0d1 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 -@@ -11,11 +11,20 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 54863e95aee7..936368e4205a 100644 +--- third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" ++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 @@ -33623,7 +36112,7 @@ index 65eb95889500..a65ae523f0d1 100644 FINAL_LIBRARY = "webrtc" -@@ -43,171 +52,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -33631,7 +36120,7 @@ index 65eb95889500..a65ae523f0d1 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -33641,10 +36130,6 @@ index 65eb95889500..a65ae523f0d1 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -33669,13 +36154,10 @@ index 65eb95889500..a65ae523f0d1 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -33710,13 +36192,6 @@ index 65eb95889500..a65ae523f0d1 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -33726,13 +36201,31 @@ index 65eb95889500..a65ae523f0d1 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ +- CFLAGS += [ - "-mfpu=neon" - ] - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -33766,9 +36259,8 @@ index 65eb95889500..a65ae523f0d1 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ +- + CFLAGS += [ "-msse2" ] @@ -33785,34 +36277,40 @@ index 65eb95889500..a65ae523f0d1 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- -- CXXFLAGS += [ ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 b9b954b26e57..25cb3b9da185 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 afee108cb3a1..436a0dda6fd4 100644 +--- third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -33821,7 +36319,7 @@ index b9b954b26e57..25cb3b9da185 100644 FINAL_LIBRARY = "webrtc" -@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,183 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -33829,7 +36327,7 @@ index b9b954b26e57..25cb3b9da185 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -33870,6 +36368,7 @@ index b9b954b26e57..25cb3b9da185 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -33904,6 +36403,10 @@ index b9b954b26e57..25cb3b9da185 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -33913,9 +36416,31 @@ index b9b954b26e57..25cb3b9da185 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -33950,6 +36475,10 @@ index b9b954b26e57..25cb3b9da185 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -33963,30 +36492,40 @@ index b9b954b26e57..25cb3b9da185 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 93cb37e76226..79eb1de244cf 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 c4fa5c8bc4fe..7be902bc7b5d 100644 +--- third_party/libwebrtc/modules/audio_coding/red_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/red_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -33995,7 +36534,7 @@ index 93cb37e76226..79eb1de244cf 100644 FINAL_LIBRARY = "webrtc" -@@ -36,159 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -34003,7 +36542,7 @@ index 93cb37e76226..79eb1de244cf 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -34048,6 +36587,7 @@ index 93cb37e76226..79eb1de244cf 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -34098,9 +36638,31 @@ index 93cb37e76226..79eb1de244cf 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -34135,6 +36697,10 @@ index 93cb37e76226..79eb1de244cf 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -34148,31 +36714,40 @@ index 93cb37e76226..79eb1de244cf 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 60fff08a31fd..f268034294f9 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 -@@ -16,11 +16,20 @@ CXXFLAGS += [ ++ DEFINES["USE_X11"] = "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 4a9c24069e74..ea61654f618e 100644 +--- third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" ++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 @@ -34181,7 +36756,7 @@ index 60fff08a31fd..f268034294f9 100644 FINAL_LIBRARY = "webrtc" -@@ -50,133 +59,9 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -34189,7 +36764,7 @@ index 60fff08a31fd..f268034294f9 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -34222,7 +36797,6 @@ index 60fff08a31fd..f268034294f9 100644 - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_GNU_SOURCE"] = True - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True @@ -34235,6 +36809,7 @@ index 60fff08a31fd..f268034294f9 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -34276,6 +36851,40 @@ index 60fff08a31fd..f268034294f9 100644 - "secur32", - "winmm" - ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -34287,8 +36896,8 @@ index 60fff08a31fd..f268034294f9 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True - +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -34301,37 +36910,69 @@ index 60fff08a31fd..f268034294f9 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" +- OS_LIBS += [ +- "android_support", +- "unwind" - ] - +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - 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 fde5dd657ee8..b0daf24ff4f4 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 99ea47c13acc..1edab76c795b 100644 +--- third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build +@@ -12,6 +12,9 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_CODEC_ILBC"] = True + DEFINES["WEBRTC_CODEC_OPUS"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" - DEFINES["WEBRTC_LIBRARY_IMPL"] = True +@@ -19,7 +22,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 @@ -34340,7 +36981,7 @@ index fde5dd657ee8..b0daf24ff4f4 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -48,183 +57,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -34348,7 +36989,7 @@ index fde5dd657ee8..b0daf24ff4f4 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -34358,6 +36999,10 @@ index fde5dd657ee8..b0daf24ff4f4 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -34385,6 +37030,7 @@ index fde5dd657ee8..b0daf24ff4f4 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -34419,6 +37065,10 @@ index fde5dd657ee8..b0daf24ff4f4 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -34428,9 +37078,31 @@ index fde5dd657ee8..b0daf24ff4f4 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -34465,6 +37137,10 @@ index fde5dd657ee8..b0daf24ff4f4 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -34478,30 +37154,43 @@ index fde5dd657ee8..b0daf24ff4f4 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 6d54ad479d4c..ce68a7e8b5c9 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 49fb552b0d38..bdf1cbbf4c27 100644 +--- third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build +@@ -12,6 +12,9 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_CODEC_ILBC"] = True + DEFINES["WEBRTC_CODEC_OPUS"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" - DEFINES["WEBRTC_LIBRARY_IMPL"] = True +@@ -19,7 +22,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 @@ -34510,7 +37199,7 @@ index 6d54ad479d4c..ce68a7e8b5c9 100644 FINAL_LIBRARY = "webrtc" -@@ -36,159 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -48,190 +57,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -34518,7 +37207,7 @@ index 6d54ad479d4c..ce68a7e8b5c9 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -34563,6 +37252,7 @@ index 6d54ad479d4c..ce68a7e8b5c9 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -34613,9 +37303,31 @@ index 6d54ad479d4c..ce68a7e8b5c9 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -34650,6 +37362,10 @@ index 6d54ad479d4c..ce68a7e8b5c9 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -34663,31 +37379,43 @@ index 6d54ad479d4c..ce68a7e8b5c9 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 23619827e1e9..c5fdfa973bff 100644 ---- third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build -+++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build -@@ -11,11 +11,20 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 20e1d37306c9..604d2ff1160d 100644 +--- third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build ++++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build +@@ -12,6 +12,9 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" ++DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_CODEC_ILBC"] = True + DEFINES["WEBRTC_CODEC_OPUS"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" - DEFINES["WEBRTC_LIBRARY_IMPL"] = True +@@ -19,7 +22,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 @@ -34696,7 +37424,7 @@ index 23619827e1e9..c5fdfa973bff 100644 FINAL_LIBRARY = "webrtc" -@@ -94,171 +103,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -47,183 +56,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -34704,7 +37432,7 @@ index 23619827e1e9..c5fdfa973bff 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -34742,13 +37470,10 @@ index 23619827e1e9..c5fdfa973bff 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -34785,9 +37510,6 @@ index 23619827e1e9..c5fdfa973bff 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -34806,6 +37528,24 @@ index 23619827e1e9..c5fdfa973bff 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -34839,8 +37579,7 @@ index 23619827e1e9..c5fdfa973bff 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -34858,34 +37597,40 @@ index 23619827e1e9..c5fdfa973bff 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 12998c4b029b..de798435bb2a 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 40ed29f25814..101e685fa20c 100644 +--- third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build ++++ third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -34894,7 +37639,7 @@ index 12998c4b029b..de798435bb2a 100644 FINAL_LIBRARY = "webrtc" -@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -34902,7 +37647,7 @@ index 12998c4b029b..de798435bb2a 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -34912,10 +37657,6 @@ index 12998c4b029b..de798435bb2a 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -34943,6 +37684,7 @@ index 12998c4b029b..de798435bb2a 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -34990,6 +37732,22 @@ index 12998c4b029b..de798435bb2a 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -35011,9 +37769,10 @@ index 12998c4b029b..de798435bb2a 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -35043,23 +37802,24 @@ index 12998c4b029b..de798435bb2a 100644 - - 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 363190680672..de7572325155 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("audio_device_gn") +diff --git third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build +index c6a45f9a3761..f1359947dd44 100644 +--- third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build ++++ third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -35068,7 +37828,7 @@ index 363190680672..de7572325155 100644 FINAL_LIBRARY = "webrtc" -@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -35076,7 +37836,7 @@ index 363190680672..de7572325155 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -35114,9 +37874,14 @@ index 363190680672..de7572325155 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -35153,6 +37918,9 @@ index 363190680672..de7572325155 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -35164,9 +37932,31 @@ index 363190680672..de7572325155 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -35201,6 +37991,10 @@ index 363190680672..de7572325155 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -35214,30 +38008,41 @@ index 363190680672..de7572325155 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 622012d48c36..8581270b776d 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + 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 32a47e6b064d..44ff455cc768 100644 +--- third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build ++++ third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" + DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +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 @@ -35246,7 +38051,7 @@ index 622012d48c36..8581270b776d 100644 FINAL_LIBRARY = "webrtc" -@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -35254,7 +38059,7 @@ index 622012d48c36..8581270b776d 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -35292,9 +38097,14 @@ index 622012d48c36..8581270b776d 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -35331,6 +38141,9 @@ index 622012d48c36..8581270b776d 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -35342,183 +38155,31 @@ index 622012d48c36..8581270b776d 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" -- --if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -- -- OS_LIBS += [ -- "android_support" -- ] -- --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["CPU_ARCH"] == "mips64": - - 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 b4829b141af4..9b87c9644114 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True -+DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["_FILE_OFFSET_BITS"] = "64" -+DEFINES["_LARGEFILE64_SOURCE"] = True -+DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True - - FINAL_LIBRARY = "webrtc" -@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: - if CONFIG["MOZ_DEBUG"] == "1": + if CONFIG["CPU_ARCH"] == "x86": - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" -- --if CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" -- DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- -- OS_LIBS += [ -- "log" -- ] -- --if CONFIG["OS_TARGET"] == "Darwin": +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True -- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_AURA"] = "1" -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_NSS_CERTS"] = "1" -- DEFINES["USE_OZONE"] = "1" -- DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True -- DEFINES["NOMINMAX"] = True -- DEFINES["NTDDI_VERSION"] = "0x0A000000" -- DEFINES["PSAPI_VERSION"] = "2" -- DEFINES["UNICODE"] = True -- DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True -- DEFINES["WIN32"] = True -- DEFINES["WIN32_LEAN_AND_MEAN"] = True -- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" -- DEFINES["WINVER"] = "0x0A00" -- DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_RAND_S"] = True -- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True -- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True -- DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True -- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True -- DEFINES["_SECURE_ATL"] = True -- DEFINES["_UNICODE"] = True -- DEFINES["_WIN32_WINNT"] = "0x0A00" -- DEFINES["_WINDOWS"] = True -- DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": +-if CONFIG["CPU_ARCH"] == "x86_64": - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -35553,6 +38214,10 @@ index b4829b141af4..9b87c9644114 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -35566,30 +38231,40 @@ index b4829b141af4..9b87c9644114 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 1eb77fe2feac..63dc829e16f9 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("audio_mixer_impl_gn") +diff --git third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build +index 60ecc93ab967..556de6ede5e6 100644 +--- third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -35598,7 +38273,7 @@ index 1eb77fe2feac..63dc829e16f9 100644 FINAL_LIBRARY = "webrtc" -@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -35606,7 +38281,7 @@ index 1eb77fe2feac..63dc829e16f9 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -35647,6 +38322,7 @@ index 1eb77fe2feac..63dc829e16f9 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -35681,10 +38357,6 @@ index 1eb77fe2feac..63dc829e16f9 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -35698,6 +38370,22 @@ index 1eb77fe2feac..63dc829e16f9 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -35719,9 +38407,10 @@ index 1eb77fe2feac..63dc829e16f9 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -35751,23 +38440,24 @@ index 1eb77fe2feac..63dc829e16f9 100644 - - 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 49b34c44cb0e..9538a5c9889c 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("adaptive_fir_filter_erl_gn") +diff --git third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build +index fd78a435604d..aed93b9c682d 100644 +--- third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -35776,7 +38466,7 @@ index 49b34c44cb0e..9538a5c9889c 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -35784,7 +38474,7 @@ index 49b34c44cb0e..9538a5c9889c 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -35822,9 +38512,14 @@ index 49b34c44cb0e..9538a5c9889c 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -35861,6 +38556,9 @@ index 49b34c44cb0e..9538a5c9889c 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -35872,14 +38570,26 @@ index 49b34c44cb0e..9538a5c9889c 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -35901,9 +38611,10 @@ index 49b34c44cb0e..9538a5c9889c 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -35913,10 +38624,6 @@ index 49b34c44cb0e..9538a5c9889c 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -35930,35 +38637,33 @@ index 49b34c44cb0e..9538a5c9889c 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = 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 65b987429c4e..af94e6384a52 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + 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 6f67bd6fad7f..301dd09d6644 100644 +--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build +@@ -17,13 +17,22 @@ CXXFLAGS += [ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" + DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +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 @@ -35967,7 +38672,7 @@ index 65b987429c4e..af94e6384a52 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -54,137 +63,16 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -35975,7 +38680,7 @@ index 65b987429c4e..af94e6384a52 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -36008,14 +38713,20 @@ index 65b987429c4e..af94e6384a52 100644 - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_GNU_SOURCE"] = True - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -36052,24 +38763,11 @@ index 65b987429c4e..af94e6384a52 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": -- -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -36085,8 +38783,8 @@ index 65b987429c4e..af94e6384a52 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" @@ -36095,61 +38793,43 @@ index 65b987429c4e..af94e6384a52 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -- -- CXXFLAGS += [ -- "-msse2" -- ] -- -- OS_LIBS += [ -- "android_support" -- ] -- --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["CPU_ARCH"] == "x86": CXXFLAGS += [ "-msse2" ] -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True +- OS_LIBS += [ +- "android_support" +- ] - - 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 f317d9be88ee..84883d3dddda 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": +- CXXFLAGS += [ +- "-msse2" +- ] ++ DEFINES["USE_X11"] = "1" + + Library("aec3_avx2_gn") +diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build +index b0952a7d0cd8..8a9d53a1b709 100644 +--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -36158,7 +38838,7 @@ index f317d9be88ee..84883d3dddda 100644 FINAL_LIBRARY = "webrtc" -@@ -42,96 +51,7 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -36166,7 +38846,7 @@ index f317d9be88ee..84883d3dddda 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -36176,10 +38856,6 @@ index f317d9be88ee..84883d3dddda 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -36204,13 +38880,10 @@ index f317d9be88ee..84883d3dddda 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -36245,35 +38918,35 @@ index f317d9be88ee..84883d3dddda 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": -@@ -142,79 +62,10 @@ if CONFIG["CPU_ARCH"] == "aarch64": - "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_neon.cc" - ] + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- SOURCES += [ -- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_neon.cc" -- ] + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True - +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -36295,9 +38968,10 @@ index f317d9be88ee..84883d3dddda 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -36306,12 +38980,7 @@ index f317d9be88ee..84883d3dddda 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -36326,34 +38995,30 @@ index f317d9be88ee..84883d3dddda 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("aecm_core_gn") -diff --git third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build -index ff59d4de4fb8..7feca48963aa 100644 ---- third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build -+++ third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build -@@ -11,11 +11,20 @@ AllowCompilerWarnings() - + Library("aec3_common_gn") +diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build +index 97bbc435395f..0fba9b70c95b 100644 +--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" ++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 @@ -36362,7 +39027,7 @@ index ff59d4de4fb8..7feca48963aa 100644 FINAL_LIBRARY = "webrtc" -@@ -41,171 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -36370,7 +39035,7 @@ index ff59d4de4fb8..7feca48963aa 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -36415,6 +39080,7 @@ index ff59d4de4fb8..7feca48963aa 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -36465,14 +39131,26 @@ index ff59d4de4fb8..7feca48963aa 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -36494,9 +39172,10 @@ index ff59d4de4fb8..7feca48963aa 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -36505,12 +39184,7 @@ index ff59d4de4fb8..7feca48963aa 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -36525,33 +39199,31 @@ index ff59d4de4fb8..7feca48963aa 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = 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 7efc673f0c5b..27c920d237c5 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + 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 6646d41ff3a8..b680faacb6b6 100644 +--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" + DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +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 @@ -36560,7 +39232,7 @@ index 7efc673f0c5b..27c920d237c5 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -100,190 +109,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -36568,7 +39240,7 @@ index 7efc673f0c5b..27c920d237c5 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -36578,6 +39250,10 @@ index 7efc673f0c5b..27c920d237c5 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -36602,9 +39278,14 @@ index 7efc673f0c5b..27c920d237c5 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -36639,6 +39320,13 @@ index 7efc673f0c5b..27c920d237c5 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -36648,9 +39336,31 @@ index 7efc673f0c5b..27c920d237c5 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -36685,6 +39395,10 @@ index 7efc673f0c5b..27c920d237c5 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -36698,30 +39412,40 @@ index 7efc673f0c5b..27c920d237c5 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("gain_control_interface_gn") -diff --git third_party/libwebrtc/modules/audio_processing/agc/gain_map_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/gain_map_gn/moz.build -index 6728434078cf..fde6cf4827d4 100644 ---- third_party/libwebrtc/modules/audio_processing/agc/gain_map_gn/moz.build -+++ third_party/libwebrtc/modules/audio_processing/agc/gain_map_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("aec3_gn") +diff --git third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build +index d77163999ba8..bbfd52a05ced 100644 +--- third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -36730,7 +39454,7 @@ index 6728434078cf..fde6cf4827d4 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -36738,7 +39462,7 @@ index 6728434078cf..fde6cf4827d4 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -36748,6 +39472,10 @@ index 6728434078cf..fde6cf4827d4 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -36775,6 +39503,7 @@ index 6728434078cf..fde6cf4827d4 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -36822,6 +39551,22 @@ index 6728434078cf..fde6cf4827d4 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -36843,9 +39588,10 @@ index 6728434078cf..fde6cf4827d4 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -36875,23 +39621,24 @@ index 6728434078cf..fde6cf4827d4 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("gain_map_gn") -diff --git third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build -index 270cb5d3a7c7..c9336e1e4b32 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("fft_data_gn") +diff --git third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build +index bae4fa297266..af83e29c22cb 100644 +--- third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -36900,7 +39647,7 @@ index 270cb5d3a7c7..c9336e1e4b32 100644 FINAL_LIBRARY = "webrtc" -@@ -41,171 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -36908,7 +39655,7 @@ index 270cb5d3a7c7..c9336e1e4b32 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -36946,13 +39693,10 @@ index 270cb5d3a7c7..c9336e1e4b32 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -36987,13 +39731,6 @@ index 270cb5d3a7c7..c9336e1e4b32 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -37003,14 +39740,26 @@ index 270cb5d3a7c7..c9336e1e4b32 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -37032,9 +39781,10 @@ index 270cb5d3a7c7..c9336e1e4b32 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -37043,12 +39793,7 @@ index 270cb5d3a7c7..c9336e1e4b32 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -37063,33 +39808,30 @@ index 270cb5d3a7c7..c9336e1e4b32 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = 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 befd830a176c..d4678106bbb7 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("matched_filter_gn") +diff --git third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build +index b7a10f5d7c88..8068d5e8b48a 100644 +--- third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -37098,7 +39840,7 @@ index befd830a176c..d4678106bbb7 100644 FINAL_LIBRARY = "webrtc" -@@ -42,171 +51,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -37106,7 +39848,7 @@ index befd830a176c..d4678106bbb7 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -37144,13 +39886,10 @@ index befd830a176c..d4678106bbb7 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -37185,13 +39924,6 @@ index befd830a176c..d4678106bbb7 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -37201,14 +39933,26 @@ index befd830a176c..d4678106bbb7 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -37230,9 +39974,10 @@ index befd830a176c..d4678106bbb7 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -37241,12 +39986,7 @@ index befd830a176c..d4678106bbb7 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -37261,34 +40001,30 @@ index befd830a176c..d4678106bbb7 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("level_estimation_gn") -diff --git third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gn/moz.build -index d303a108d72b..804d6d990568 100644 ---- third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gn/moz.build -+++ third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gn/moz.build -@@ -11,11 +11,20 @@ AllowCompilerWarnings() - + Library("render_buffer_gn") +diff --git third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build +index 89ee0b6a8172..e2c6c18ff9e0 100644 +--- third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" ++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 @@ -37297,7 +40033,7 @@ index d303a108d72b..804d6d990568 100644 FINAL_LIBRARY = "webrtc" -@@ -44,171 +53,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -37305,7 +40041,7 @@ index d303a108d72b..804d6d990568 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -37343,13 +40079,10 @@ index d303a108d72b..804d6d990568 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -37384,13 +40117,6 @@ index d303a108d72b..804d6d990568 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -37400,14 +40126,26 @@ index d303a108d72b..804d6d990568 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -37429,9 +40167,10 @@ index d303a108d72b..804d6d990568 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -37440,12 +40179,7 @@ index d303a108d72b..804d6d990568 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -37460,33 +40194,30 @@ index d303a108d72b..804d6d990568 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("adaptive_digital_gn") -diff --git third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build -index d0bfd82c2350..8b176cf0be5c 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("vector_math_gn") +diff --git third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build +index 201cd58360cf..28209dac0b7d 100644 +--- third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -37495,7 +40226,7 @@ index d0bfd82c2350..8b176cf0be5c 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -37503,7 +40234,7 @@ index d0bfd82c2350..8b176cf0be5c 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -37544,6 +40275,7 @@ index d0bfd82c2350..8b176cf0be5c 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -37591,14 +40323,26 @@ index d0bfd82c2350..8b176cf0be5c 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -37620,9 +40364,10 @@ index d0bfd82c2350..8b176cf0be5c 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -37632,10 +40377,6 @@ index d0bfd82c2350..8b176cf0be5c 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -37649,35 +40390,31 @@ index d0bfd82c2350..8b176cf0be5c 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("biquad_filter_gn") -diff --git third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build -index 5ff8ddf35df1..01e415267019 100644 ---- third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build -+++ third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("aec_dump_gn") +diff --git third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build +index 974b70b087d2..e7cd5f585b83 100644 +--- third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -37686,7 +40423,7 @@ index 5ff8ddf35df1..01e415267019 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -37694,7 +40431,7 @@ index 5ff8ddf35df1..01e415267019 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -37735,6 +40472,7 @@ index 5ff8ddf35df1..01e415267019 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -37789,6 +40527,24 @@ index 5ff8ddf35df1..01e415267019 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -37823,10 +40579,10 @@ index 5ff8ddf35df1..01e415267019 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -37840,36 +40596,40 @@ index 5ff8ddf35df1..01e415267019 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("common_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 5791bea212ad..01762efb5d8e 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 -@@ -11,11 +11,20 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 1c47bbd5cc1e..c51fcb7d6a97 100644 +--- third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" ++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 @@ -37878,7 +40638,7 @@ index 5791bea212ad..01762efb5d8e 100644 FINAL_LIBRARY = "webrtc" -@@ -43,171 +52,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -37886,7 +40646,7 @@ index 5791bea212ad..01762efb5d8e 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -37924,13 +40684,10 @@ index 5791bea212ad..01762efb5d8e 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -37967,9 +40724,6 @@ index 5791bea212ad..01762efb5d8e 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -37988,6 +40742,24 @@ index 5791bea212ad..01762efb5d8e 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -38021,8 +40793,7 @@ index 5791bea212ad..01762efb5d8e 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -38040,34 +40811,40 @@ index 5791bea212ad..01762efb5d8e 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 d4ffe13d2d76..ff7d3128f91e 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 f0e41cd6bd08..9fec01cfbcec 100644 +--- third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -38076,7 +40853,7 @@ index d4ffe13d2d76..ff7d3128f91e 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,113 +53,7 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -38084,7 +40861,7 @@ index d4ffe13d2d76..ff7d3128f91e 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -38098,6 +40875,10 @@ index d4ffe13d2d76..ff7d3128f91e 100644 - "log" - ] - +- SOURCES += [ +- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -38107,6 +40888,10 @@ index d4ffe13d2d76..ff7d3128f91e 100644 - 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": - - DEFINES["USE_AURA"] = "1" @@ -38122,9 +40907,14 @@ index d4ffe13d2d76..ff7d3128f91e 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -38134,6 +40924,10 @@ index d4ffe13d2d76..ff7d3128f91e 100644 - 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": - - DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True @@ -38161,15 +40955,26 @@ index d4ffe13d2d76..ff7d3128f91e 100644 - 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["CPU_ARCH"] == "aarch64": - DEFINES["WEBRTC_ARCH_ARM64"] = True +@@ -158,20 +61,7 @@ if CONFIG["CPU_ARCH"] == "aarch64": DEFINES["WEBRTC_HAS_NEON"] = True + SOURCES += [ +- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_neon.cc" +- ] +- -if CONFIG["CPU_ARCH"] == "arm": - - CXXFLAGS += [ @@ -38180,6 +40985,46 @@ index d4ffe13d2d76..ff7d3128f91e 100644 - 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" + ] + +@@ -179,7 +69,6 @@ if CONFIG["CPU_ARCH"] == "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" +@@ -187,8 +76,6 @@ if CONFIG["CPU_ARCH"] == "mips32": + + if CONFIG["CPU_ARCH"] == "mips64": + +- DEFINES["_GNU_SOURCE"] = True +- + SOURCES += [ + "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" + ] +@@ -199,95 +86,28 @@ if CONFIG["CPU_ARCH"] == "ppc64": + "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" + ] + +-if CONFIG["CPU_ARCH"] == "riscv64": +- +- SOURCES += [ +- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" +- ] +- + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -38213,10 +41058,10 @@ index d4ffe13d2d76..ff7d3128f91e 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -38225,34 +41070,54 @@ index d4ffe13d2d76..ff7d3128f91e 100644 - - DEFINES["_GNU_SOURCE"] = True - +- SOURCES += [ +- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" +- ] +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" + SOURCES += [ + "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" ] -- DEFINES["_GNU_SOURCE"] = True +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + SOURCES += [ + "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" + ] + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True - - Library("gain_applier_gn") -diff --git third_party/libwebrtc/modules/audio_processing/agc2/level_estimation_agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/level_estimation_agc_gn/moz.build -index 27a0931eab96..8067136a0adb 100644 ---- third_party/libwebrtc/modules/audio_processing/agc2/level_estimation_agc_gn/moz.build -+++ third_party/libwebrtc/modules/audio_processing/agc2/level_estimation_agc_gn/moz.build -@@ -11,11 +11,20 @@ AllowCompilerWarnings() +- SOURCES += [ +- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" +- ] ++ DEFINES["USE_X11"] = "1" + Library("aecm_core_gn") +diff --git third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build +index 45e6cad30638..cafd3cc50045 100644 +--- third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +DEFINES["WEBRTC_BSD"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" @@ -38260,6 +41125,7 @@ index 27a0931eab96..8067136a0adb 100644 DEFINES["WEBRTC_MOZILLA_BUILD"] = True DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +DEFINES["WEBRTC_POSIX"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True @@ -38268,7 +41134,7 @@ index 27a0931eab96..8067136a0adb 100644 FINAL_LIBRARY = "webrtc" -@@ -41,171 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -38276,7 +41142,7 @@ index 27a0931eab96..8067136a0adb 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -38321,6 +41187,7 @@ index 27a0931eab96..8067136a0adb 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -38378,6 +41245,24 @@ index 27a0931eab96..8067136a0adb 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -38411,8 +41296,7 @@ index 27a0931eab96..8067136a0adb 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -38430,35 +41314,40 @@ index 27a0931eab96..8067136a0adb 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("level_estimation_agc_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 1076a2eaf57a..a71d81648a14 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 -@@ -11,11 +11,20 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("agc_gn") +diff --git third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build +index c6ab9b3160de..6cc48faee4a7 100644 +--- third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" ++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 @@ -38467,7 +41356,7 @@ index 1076a2eaf57a..a71d81648a14 100644 FINAL_LIBRARY = "webrtc" -@@ -44,171 +53,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -38475,7 +41364,7 @@ index 1076a2eaf57a..a71d81648a14 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -38485,10 +41374,6 @@ index 1076a2eaf57a..a71d81648a14 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -38513,13 +41398,10 @@ index 1076a2eaf57a..a71d81648a14 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -38554,13 +41436,6 @@ index 1076a2eaf57a..a71d81648a14 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -38570,14 +41445,26 @@ index 1076a2eaf57a..a71d81648a14 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -38599,9 +41486,10 @@ index 1076a2eaf57a..a71d81648a14 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -38610,12 +41498,7 @@ index 1076a2eaf57a..a71d81648a14 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -38630,33 +41513,30 @@ index 1076a2eaf57a..a71d81648a14 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("noise_level_estimator_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 eef4b67a679a..295a08f917af 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("gain_control_interface_gn") +diff --git third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build +index 0188a8ac107e..364ef9950f2c 100644 +--- third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -38665,7 +41545,7 @@ index eef4b67a679a..295a08f917af 100644 FINAL_LIBRARY = "webrtc" -@@ -48,171 +57,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -38673,7 +41553,7 @@ index eef4b67a679a..295a08f917af 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -38718,6 +41598,7 @@ index eef4b67a679a..295a08f917af 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -38775,6 +41656,24 @@ index eef4b67a679a..295a08f917af 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -38808,8 +41707,7 @@ index eef4b67a679a..295a08f917af 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -38827,34 +41725,40 @@ index eef4b67a679a..295a08f917af 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("rnn_vad_gn") -diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad_with_level_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad_with_level_gn/moz.build -index 7f05fd14ac56..587b43f2d065 100644 ---- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad_with_level_gn/moz.build -+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad_with_level_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("legacy_agc_gn") +diff --git third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build +index 9db9a639e7ae..865eee21cf92 100644 +--- third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -38863,7 +41767,7 @@ index 7f05fd14ac56..587b43f2d065 100644 FINAL_LIBRARY = "webrtc" -@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -38871,7 +41775,7 @@ index 7f05fd14ac56..587b43f2d065 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -38916,6 +41820,7 @@ index 7f05fd14ac56..587b43f2d065 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -38973,6 +41878,24 @@ index 7f05fd14ac56..587b43f2d065 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -39006,8 +41929,7 @@ index 7f05fd14ac56..587b43f2d065 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -39025,34 +41947,41 @@ index 7f05fd14ac56..587b43f2d065 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("rnn_vad_with_level_gn") -diff --git third_party/libwebrtc/modules/audio_processing/api_gn/moz.build third_party/libwebrtc/modules/audio_processing/api_gn/moz.build -index bf4851218d28..9768dd4f7525 100644 ---- third_party/libwebrtc/modules/audio_processing/api_gn/moz.build -+++ third_party/libwebrtc/modules/audio_processing/api_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + 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 7d16c9a9f5c1..ab3f79521ab8 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" + DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +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 @@ -39061,7 +41990,7 @@ index bf4851218d28..9768dd4f7525 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -39069,7 +41998,7 @@ index bf4851218d28..9768dd4f7525 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -39107,9 +42036,14 @@ index bf4851218d28..9768dd4f7525 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -39146,6 +42080,9 @@ index bf4851218d28..9768dd4f7525 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -39164,6 +42101,24 @@ index bf4851218d28..9768dd4f7525 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -39198,10 +42153,10 @@ index bf4851218d28..9768dd4f7525 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -39215,36 +42170,40 @@ index bf4851218d28..9768dd4f7525 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("api_gn") -diff --git third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build -index 64e2efdac206..3e75e671af25 100644 ---- third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build -+++ third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build -@@ -11,11 +11,20 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("adaptive_digital_gain_controller_gn") +diff --git third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build +index f396f42e5776..1d4e4aaebbe3 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" ++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 @@ -39253,7 +42212,7 @@ index 64e2efdac206..3e75e671af25 100644 FINAL_LIBRARY = "webrtc" -@@ -41,171 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -39261,7 +42220,7 @@ index 64e2efdac206..3e75e671af25 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -39299,13 +42258,10 @@ index 64e2efdac206..3e75e671af25 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -39340,13 +42296,6 @@ index 64e2efdac206..3e75e671af25 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -39363,6 +42312,24 @@ index 64e2efdac206..3e75e671af25 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -39396,8 +42363,7 @@ index 64e2efdac206..3e75e671af25 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -39415,35 +42381,40 @@ index 64e2efdac206..3e75e671af25 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 d9d1873676a1..7c0fa698eb08 100644 ---- third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build -+++ third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build -@@ -11,11 +11,20 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("biquad_filter_gn") +diff --git third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build +index 9cddd69abef4..fc59d2ead813 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" ++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 @@ -39452,7 +42423,7 @@ index d9d1873676a1..7c0fa698eb08 100644 FINAL_LIBRARY = "webrtc" -@@ -43,171 +52,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -39460,7 +42431,7 @@ index d9d1873676a1..7c0fa698eb08 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -39505,6 +42476,7 @@ index d9d1873676a1..7c0fa698eb08 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -39562,6 +42534,24 @@ index d9d1873676a1..7c0fa698eb08 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -39595,8 +42585,7 @@ index d9d1873676a1..7c0fa698eb08 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -39614,34 +42603,40 @@ index d9d1873676a1..7c0fa698eb08 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 bebdf8902351..4699f0504d43 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("clipping_predictor_gn") +diff --git third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build +index 274cae23a398..c4e0b45cf302 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -39650,7 +42645,7 @@ index bebdf8902351..4699f0504d43 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -39658,7 +42653,7 @@ index bebdf8902351..4699f0504d43 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -39668,10 +42663,6 @@ index bebdf8902351..4699f0504d43 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -39699,6 +42690,7 @@ index bebdf8902351..4699f0504d43 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -39733,10 +42725,6 @@ index bebdf8902351..4699f0504d43 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -39746,14 +42734,26 @@ index bebdf8902351..4699f0504d43 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -39775,9 +42775,10 @@ index bebdf8902351..4699f0504d43 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -39787,10 +42788,6 @@ index bebdf8902351..4699f0504d43 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -39804,35 +42801,31 @@ index bebdf8902351..4699f0504d43 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = 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 4eab83119b7c..8d57efca831b 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("common_gn") +diff --git third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build +index a4572251ad4c..6817471d99c1 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -39841,7 +42834,7 @@ index 4eab83119b7c..8d57efca831b 100644 FINAL_LIBRARY = "webrtc" -@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -39849,7 +42842,7 @@ index 4eab83119b7c..8d57efca831b 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -39887,9 +42880,14 @@ index 4eab83119b7c..8d57efca831b 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -39924,6 +42922,13 @@ index 4eab83119b7c..8d57efca831b 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -39933,9 +42938,31 @@ index 4eab83119b7c..8d57efca831b 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -39970,6 +42997,10 @@ index 4eab83119b7c..8d57efca831b 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -39983,24 +43014,33 @@ index 4eab83119b7c..8d57efca831b 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 9aa3972d9a7a..d61b41ff3dec 100644 ---- third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build -+++ third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build -@@ -11,11 +11,20 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + 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 3a54fc31711b..e87103152bc9 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +DEFINES["WEBRTC_BSD"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" @@ -40008,6 +43048,7 @@ index 9aa3972d9a7a..d61b41ff3dec 100644 DEFINES["WEBRTC_MOZILLA_BUILD"] = True DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +DEFINES["WEBRTC_POSIX"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True @@ -40016,7 +43057,7 @@ index 9aa3972d9a7a..d61b41ff3dec 100644 FINAL_LIBRARY = "webrtc" -@@ -55,171 +64,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -40024,7 +43065,7 @@ index 9aa3972d9a7a..d61b41ff3dec 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -40069,6 +43110,7 @@ index 9aa3972d9a7a..d61b41ff3dec 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -40126,6 +43168,24 @@ index 9aa3972d9a7a..d61b41ff3dec 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -40159,8 +43219,7 @@ index 9aa3972d9a7a..d61b41ff3dec 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -40178,34 +43237,40 @@ index 9aa3972d9a7a..d61b41ff3dec 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("audio_processing_gn") -diff --git third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build -index 9dc4eaa94e7c..6359c290f11f 100644 ---- third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build -+++ third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("fixed_digital_gn") +diff --git third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build +index 394aa109faf3..cb41c74ad271 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -40214,7 +43279,7 @@ index 9dc4eaa94e7c..6359c290f11f 100644 FINAL_LIBRARY = "webrtc" -@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -40222,7 +43287,7 @@ index 9dc4eaa94e7c..6359c290f11f 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -40232,6 +43297,10 @@ index 9dc4eaa94e7c..6359c290f11f 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -40259,6 +43328,7 @@ index 9dc4eaa94e7c..6359c290f11f 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -40309,6 +43379,24 @@ index 9dc4eaa94e7c..6359c290f11f 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -40343,10 +43431,10 @@ index 9dc4eaa94e7c..6359c290f11f 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -40360,35 +43448,40 @@ index 9dc4eaa94e7c..6359c290f11f 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("audio_processing_statistics_gn") -diff --git third_party/libwebrtc/modules/audio_processing/config_gn/moz.build third_party/libwebrtc/modules/audio_processing/config_gn/moz.build -index 985e8a18b2fb..51aefb103374 100644 ---- third_party/libwebrtc/modules/audio_processing/config_gn/moz.build -+++ third_party/libwebrtc/modules/audio_processing/config_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("gain_applier_gn") +diff --git third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build +index 5b1d68415a52..32bf484b86e7 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -40397,7 +43490,7 @@ index 985e8a18b2fb..51aefb103374 100644 FINAL_LIBRARY = "webrtc" -@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -40405,7 +43498,7 @@ index 985e8a18b2fb..51aefb103374 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -40442,6 +43535,7 @@ index 985e8a18b2fb..51aefb103374 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -40485,14 +43579,26 @@ index 985e8a18b2fb..51aefb103374 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -40514,9 +43620,10 @@ index 985e8a18b2fb..51aefb103374 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -40526,10 +43633,6 @@ index 985e8a18b2fb..51aefb103374 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -40543,35 +43646,32 @@ index 985e8a18b2fb..51aefb103374 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("config_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 288bc97f7b77..39bc69e1dd6f 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + 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 582eb326f3d6..8fa3a2bba795 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" + DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +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 @@ -40580,7 +43680,7 @@ index 288bc97f7b77..39bc69e1dd6f 100644 FINAL_LIBRARY = "webrtc" -@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -40588,7 +43688,7 @@ index 288bc97f7b77..39bc69e1dd6f 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -40633,6 +43733,7 @@ index 288bc97f7b77..39bc69e1dd6f 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -40690,6 +43791,24 @@ index 288bc97f7b77..39bc69e1dd6f 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -40723,8 +43842,7 @@ index 288bc97f7b77..39bc69e1dd6f 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -40742,35 +43860,40 @@ index 288bc97f7b77..39bc69e1dd6f 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 83f15c9be09c..1c5e7d3c511f 100644 ---- third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build -+++ third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build -@@ -11,11 +11,20 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("input_volume_controller_gn") +diff --git third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build +index 5a662f407985..c92be24aa407 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" ++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 @@ -40779,7 +43902,7 @@ index 83f15c9be09c..1c5e7d3c511f 100644 FINAL_LIBRARY = "webrtc" -@@ -53,171 +62,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -40787,7 +43910,7 @@ index 83f15c9be09c..1c5e7d3c511f 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -40825,13 +43948,10 @@ index 83f15c9be09c..1c5e7d3c511f 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -40868,9 +43988,6 @@ index 83f15c9be09c..1c5e7d3c511f 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -40889,6 +44006,24 @@ index 83f15c9be09c..1c5e7d3c511f 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -40922,8 +44057,7 @@ index 83f15c9be09c..1c5e7d3c511f 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -40941,34 +44075,41 @@ index 83f15c9be09c..1c5e7d3c511f 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("ns_gn") -diff --git third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build -index a86d75480786..8d35968f1bd0 100644 ---- third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build -+++ third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + 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 ba000d386223..21a9e8b6511a 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" + DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +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 @@ -40977,7 +44118,7 @@ index a86d75480786..8d35968f1bd0 100644 FINAL_LIBRARY = "webrtc" -@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -40985,7 +44126,7 @@ index a86d75480786..8d35968f1bd0 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -41030,6 +44171,7 @@ index a86d75480786..8d35968f1bd0 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -41087,6 +44229,24 @@ index a86d75480786..8d35968f1bd0 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -41120,8 +44280,7 @@ index a86d75480786..8d35968f1bd0 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -41139,34 +44298,40 @@ index a86d75480786..8d35968f1bd0 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("optionally_built_submodule_creators_gn") -diff --git third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build -index 734ed34f2a42..dd6560fc9538 100644 ---- third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build -+++ third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("noise_level_estimator_gn") +diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build +index 3f00e43e7c28..87c64337304c 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -41175,7 +44340,7 @@ index 734ed34f2a42..dd6560fc9538 100644 FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -41183,7 +44348,7 @@ index 734ed34f2a42..dd6560fc9538 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -41221,9 +44386,14 @@ index 734ed34f2a42..dd6560fc9538 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -41258,6 +44428,13 @@ index 734ed34f2a42..dd6560fc9538 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -41274,6 +44451,24 @@ index 734ed34f2a42..dd6560fc9538 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -41307,8 +44502,7 @@ index 734ed34f2a42..dd6560fc9538 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -41326,34 +44520,40 @@ index 734ed34f2a42..dd6560fc9538 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("rms_level_gn") -diff --git third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build -index 910a0f6b47e4..b6bf952b030e 100644 ---- third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build -+++ third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("rnn_vad_auto_correlation_gn") +diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build +index 64d3371d81b0..bd147bc9f851 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -41362,7 +44562,7 @@ index 910a0f6b47e4..b6bf952b030e 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -41370,7 +44570,7 @@ index 910a0f6b47e4..b6bf952b030e 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -41380,6 +44580,10 @@ index 910a0f6b47e4..b6bf952b030e 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -41404,9 +44608,14 @@ index 910a0f6b47e4..b6bf952b030e 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -41441,6 +44650,13 @@ index 910a0f6b47e4..b6bf952b030e 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -41454,6 +44670,22 @@ index 910a0f6b47e4..b6bf952b030e 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -41475,9 +44707,10 @@ index 910a0f6b47e4..b6bf952b030e 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -41507,23 +44740,24 @@ index 910a0f6b47e4..b6bf952b030e 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("transient_suppressor_api_gn") -diff --git third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build -index 01778a276399..4918c1ac774c 100644 ---- third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build -+++ third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("rnn_vad_common_gn") +diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build +index 82e5302312e5..ef8d61998fa0 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -41532,7 +44766,7 @@ index 01778a276399..4918c1ac774c 100644 FINAL_LIBRARY = "webrtc" -@@ -44,171 +53,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -41540,7 +44774,7 @@ index 01778a276399..4918c1ac774c 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -41585,6 +44819,7 @@ index 01778a276399..4918c1ac774c 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -41642,6 +44877,24 @@ index 01778a276399..4918c1ac774c 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -41675,8 +44928,7 @@ index 01778a276399..4918c1ac774c 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -41694,34 +44946,40 @@ index 01778a276399..4918c1ac774c 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("transient_suppressor_impl_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 e916a2df4b02..74b2bad9a646 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("rnn_vad_gn") +diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build +index 7dd4619965ab..63049c23fc5e 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -41730,7 +44988,7 @@ index e916a2df4b02..74b2bad9a646 100644 FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -41738,7 +44996,7 @@ index e916a2df4b02..74b2bad9a646 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -41776,9 +45034,14 @@ index e916a2df4b02..74b2bad9a646 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -41813,6 +45076,13 @@ index e916a2df4b02..74b2bad9a646 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -41829,6 +45099,24 @@ index e916a2df4b02..74b2bad9a646 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -41862,8 +45150,7 @@ index e916a2df4b02..74b2bad9a646 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -41881,34 +45168,40 @@ index e916a2df4b02..74b2bad9a646 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 ba9ff2aa76c9..7b0c7aeda6d3 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("rnn_vad_layers_gn") +diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build +index 1fcbbbe408fa..ebc5b9a10d04 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -41917,7 +45210,7 @@ index ba9ff2aa76c9..7b0c7aeda6d3 100644 FINAL_LIBRARY = "webrtc" -@@ -41,160 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -41925,7 +45218,7 @@ index ba9ff2aa76c9..7b0c7aeda6d3 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -41966,6 +45259,7 @@ index ba9ff2aa76c9..7b0c7aeda6d3 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -42016,6 +45310,24 @@ index ba9ff2aa76c9..7b0c7aeda6d3 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -42049,8 +45361,7 @@ index ba9ff2aa76c9..7b0c7aeda6d3 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -42068,34 +45379,40 @@ index ba9ff2aa76c9..7b0c7aeda6d3 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 1884650643cd..80a7f1aa597c 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("rnn_vad_lp_residual_gn") +diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build +index 6a69de9e292e..3d0349fab510 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -42104,7 +45421,7 @@ index 1884650643cd..80a7f1aa597c 100644 FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -42112,7 +45429,7 @@ index 1884650643cd..80a7f1aa597c 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -42150,9 +45467,14 @@ index 1884650643cd..80a7f1aa597c 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -42187,6 +45509,13 @@ index 1884650643cd..80a7f1aa597c 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -42203,6 +45532,24 @@ index 1884650643cd..80a7f1aa597c 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -42236,8 +45583,7 @@ index 1884650643cd..80a7f1aa597c 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -42255,34 +45601,40 @@ index 1884650643cd..80a7f1aa597c 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 e06accb998fa..af94a933e998 100644 ---- third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build -+++ third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("rnn_vad_pitch_gn") +diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build +index d2a4eb7261b6..1a81378e66f5 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -42291,7 +45643,7 @@ index e06accb998fa..af94a933e998 100644 FINAL_LIBRARY = "webrtc" -@@ -47,171 +56,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -42299,7 +45651,7 @@ index e06accb998fa..af94a933e998 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -42337,13 +45689,10 @@ index e06accb998fa..af94a933e998 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -42378,13 +45727,6 @@ index e06accb998fa..af94a933e998 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -42394,14 +45736,26 @@ index e06accb998fa..af94a933e998 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -42423,9 +45777,10 @@ index e06accb998fa..af94a933e998 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -42434,12 +45789,7 @@ index e06accb998fa..af94a933e998 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -42454,33 +45804,30 @@ index e06accb998fa..af94a933e998 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("vad_gn") -diff --git third_party/libwebrtc/modules/audio_processing/voice_detection_gn/moz.build third_party/libwebrtc/modules/audio_processing/voice_detection_gn/moz.build -index 8ef40909b1e9..b37740d287d3 100644 ---- third_party/libwebrtc/modules/audio_processing/voice_detection_gn/moz.build -+++ third_party/libwebrtc/modules/audio_processing/voice_detection_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("rnn_vad_ring_buffer_gn") +diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build +index c6913470c362..916932ccba9a 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -42489,7 +45836,7 @@ index 8ef40909b1e9..b37740d287d3 100644 FINAL_LIBRARY = "webrtc" -@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -42497,7 +45844,7 @@ index 8ef40909b1e9..b37740d287d3 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -42535,13 +45882,10 @@ index 8ef40909b1e9..b37740d287d3 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -42576,13 +45920,6 @@ index 8ef40909b1e9..b37740d287d3 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -42592,14 +45929,26 @@ index 8ef40909b1e9..b37740d287d3 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -42621,9 +45970,10 @@ index 8ef40909b1e9..b37740d287d3 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -42632,12 +45982,7 @@ index 8ef40909b1e9..b37740d287d3 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -42652,33 +45997,30 @@ index 8ef40909b1e9..b37740d287d3 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("voice_detection_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 2d13d2a8ca67..956a4127a8d7 100644 ---- third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build -+++ third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build -@@ -12,10 +12,19 @@ AllowCompilerWarnings() + Library("rnn_vad_sequence_buffer_gn") +diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build +index 8298c7e091d7..db6f13136c47 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -42687,7 +46029,7 @@ index 2d13d2a8ca67..956a4127a8d7 100644 FINAL_LIBRARY = "webrtc" -@@ -41,173 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -42695,7 +46037,7 @@ index 2d13d2a8ca67..956a4127a8d7 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -42706,7 +46048,6 @@ index 2d13d2a8ca67..956a4127a8d7 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -42735,13 +46076,13 @@ index 2d13d2a8ca67..956a4127a8d7 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -42799,6 +46140,24 @@ index 2d13d2a8ca67..956a4127a8d7 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -42832,8 +46191,7 @@ index 2d13d2a8ca67..956a4127a8d7 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -42851,34 +46209,40 @@ index 2d13d2a8ca67..956a4127a8d7 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 a991b965ece6..1f7427c15bc5 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("rnn_vad_spectral_features_gn") +diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build +index acb933045439..e9cb91b4da31 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -42887,7 +46251,7 @@ index a991b965ece6..1f7427c15bc5 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -42895,7 +46259,7 @@ index a991b965ece6..1f7427c15bc5 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -42936,6 +46300,7 @@ index a991b965ece6..1f7427c15bc5 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -42970,10 +46335,6 @@ index a991b965ece6..1f7427c15bc5 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -42983,14 +46344,26 @@ index a991b965ece6..1f7427c15bc5 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -43012,9 +46385,10 @@ index a991b965ece6..1f7427c15bc5 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -43024,10 +46398,6 @@ index a991b965ece6..1f7427c15bc5 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -43041,35 +46411,32 @@ index a991b965ece6..1f7427c15bc5 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = 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 1b862f9fa48b..29a0679b9078 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 -@@ -12,10 +12,19 @@ AllowCompilerWarnings() + Library("rnn_vad_symmetric_matrix_buffer_gn") +diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build +index 275c512cf6bb..d8f9ba076c5f 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build +@@ -17,12 +17,21 @@ CXXFLAGS += [ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -43078,7 +46445,7 @@ index 1b862f9fa48b..29a0679b9078 100644 FINAL_LIBRARY = "webrtc" -@@ -41,173 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -49,137 +58,16 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -43086,7 +46453,7 @@ index 1b862f9fa48b..29a0679b9078 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -43097,7 +46464,6 @@ index 1b862f9fa48b..29a0679b9078 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -43120,19 +46486,20 @@ index 1b862f9fa48b..29a0679b9078 100644 - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_GNU_SOURCE"] = True - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -43174,22 +46541,6 @@ index 1b862f9fa48b..29a0679b9078 100644 - "secur32", - "winmm" - ] -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": -- -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -43205,8 +46556,8 @@ index 1b862f9fa48b..29a0679b9078 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" @@ -43215,13 +46566,6 @@ index 1b862f9fa48b..29a0679b9078 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +if CONFIG["CPU_ARCH"] == "x86": @@ -43233,43 +46577,32 @@ index 1b862f9fa48b..29a0679b9078 100644 - "android_support" - ] - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - CXXFLAGS += [ - "-msse2" - ] -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = 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 49b461e41162..9e29632b8847 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 -@@ -12,10 +12,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + + Library("vector_math_avx2_gn") +diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build +index 263ec679e37d..e2c6c18ff9e0 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -43278,7 +46611,7 @@ index 49b461e41162..9e29632b8847 100644 FINAL_LIBRARY = "webrtc" -@@ -46,173 +55,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -43286,7 +46619,7 @@ index 49b461e41162..9e29632b8847 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -43297,7 +46630,6 @@ index 49b461e41162..9e29632b8847 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -43326,13 +46658,13 @@ index 49b461e41162..9e29632b8847 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -43383,14 +46715,26 @@ index 49b461e41162..9e29632b8847 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -43412,9 +46756,10 @@ index 49b461e41162..9e29632b8847 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -43423,12 +46768,7 @@ index 49b461e41162..9e29632b8847 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -43443,33 +46783,31 @@ index 49b461e41162..9e29632b8847 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = 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 df17f5d59fe4..617906387e5d 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 -@@ -12,10 +12,19 @@ AllowCompilerWarnings() + 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 a1e6f309bffa..934bd6d2cdd2 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" + DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +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 @@ -43478,7 +46816,7 @@ index df17f5d59fe4..617906387e5d 100644 FINAL_LIBRARY = "webrtc" -@@ -41,173 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -43486,7 +46824,7 @@ index df17f5d59fe4..617906387e5d 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -43497,7 +46835,6 @@ index df17f5d59fe4..617906387e5d 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -43526,13 +46863,13 @@ index df17f5d59fe4..617906387e5d 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -43590,6 +46927,24 @@ index df17f5d59fe4..617906387e5d 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -43623,8 +46978,7 @@ index df17f5d59fe4..617906387e5d 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -43642,34 +46996,41 @@ index df17f5d59fe4..617906387e5d 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 90860d224cff..2e6f3c2b7f72 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + 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 bb1dbc67b847..ad6f735a2729 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" + DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +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 @@ -43678,7 +47039,7 @@ index 90860d224cff..2e6f3c2b7f72 100644 FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -43686,7 +47047,7 @@ index 90860d224cff..2e6f3c2b7f72 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -43724,9 +47085,14 @@ index 90860d224cff..2e6f3c2b7f72 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -43761,6 +47127,13 @@ index 90860d224cff..2e6f3c2b7f72 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -43777,6 +47150,24 @@ index 90860d224cff..2e6f3c2b7f72 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -43810,8 +47201,7 @@ index 90860d224cff..2e6f3c2b7f72 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -43829,34 +47219,40 @@ index 90860d224cff..2e6f3c2b7f72 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("link_capacity_estimator_gn") -diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_controller_gn/moz.build -index 343754d93659..9b5b530ef0eb 100644 ---- third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_controller_gn/moz.build -+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_controller_gn/moz.build -@@ -12,10 +12,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + + Library("speech_level_estimator_gn") +diff --git third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build +index dfa276510899..9f02e46a59fd 100644 +--- third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -43865,7 +47261,7 @@ index 343754d93659..9b5b530ef0eb 100644 FINAL_LIBRARY = "webrtc" -@@ -42,173 +51,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -43873,7 +47269,7 @@ index 343754d93659..9b5b530ef0eb 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -43884,7 +47280,6 @@ index 343754d93659..9b5b530ef0eb 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -43913,13 +47308,13 @@ index 343754d93659..9b5b530ef0eb 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -43977,6 +47372,24 @@ index 343754d93659..9b5b530ef0eb 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -44010,8 +47423,7 @@ index 343754d93659..9b5b530ef0eb 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -44029,34 +47441,40 @@ index 343754d93659..9b5b530ef0eb 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("loss_based_controller_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 6ee25f7b9dae..620dabfd9f22 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("vad_wrapper_gn") +diff --git third_party/libwebrtc/modules/audio_processing/api_gn/moz.build third_party/libwebrtc/modules/audio_processing/api_gn/moz.build +index 7f1c48ac391e..d6226679c01e 100644 +--- third_party/libwebrtc/modules/audio_processing/api_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/api_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -44065,7 +47483,7 @@ index 6ee25f7b9dae..620dabfd9f22 100644 FINAL_LIBRARY = "webrtc" -@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -44073,7 +47491,7 @@ index 6ee25f7b9dae..620dabfd9f22 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -44084,7 +47502,6 @@ index 6ee25f7b9dae..620dabfd9f22 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -44112,14 +47529,10 @@ index 6ee25f7b9dae..620dabfd9f22 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -44156,9 +47569,6 @@ index 6ee25f7b9dae..620dabfd9f22 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -44177,6 +47587,24 @@ index 6ee25f7b9dae..620dabfd9f22 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -44210,8 +47638,7 @@ index 6ee25f7b9dae..620dabfd9f22 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -44229,34 +47656,41 @@ index 6ee25f7b9dae..620dabfd9f22 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 b741f49e9134..6347ad262130 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("api_gn") +diff --git third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build +index b6d96414b469..7a4060eadad0 100644 +--- third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" + DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +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 @@ -44265,7 +47699,7 @@ index b741f49e9134..6347ad262130 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -44273,7 +47707,7 @@ index b741f49e9134..6347ad262130 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -44311,9 +47745,14 @@ index b741f49e9134..6347ad262130 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -44350,6 +47789,9 @@ index b741f49e9134..6347ad262130 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -44368,6 +47810,24 @@ index b741f49e9134..6347ad262130 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -44402,10 +47862,10 @@ index b741f49e9134..6347ad262130 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -44419,35 +47879,41 @@ index b741f49e9134..6347ad262130 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("pushback_controller_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 95460fd8514b..b74b356b6c08 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 2291d2981df8..a6e68e27491a 100644 +--- third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" + DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +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 @@ -44456,7 +47922,7 @@ index 95460fd8514b..b74b356b6c08 100644 FINAL_LIBRARY = "webrtc" -@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -44464,7 +47930,7 @@ index 95460fd8514b..b74b356b6c08 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -44475,7 +47941,6 @@ index 95460fd8514b..b74b356b6c08 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -44504,13 +47969,13 @@ index 95460fd8514b..b74b356b6c08 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -44568,6 +48033,24 @@ index 95460fd8514b..b74b356b6c08 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -44601,8 +48084,7 @@ index 95460fd8514b..b74b356b6c08 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -44620,34 +48102,40 @@ index 95460fd8514b..b74b356b6c08 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 691dd4a4489a..2cc796f64edd 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 683d86e74389..d0b535438023 100644 +--- third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -44656,7 +48144,7 @@ index 691dd4a4489a..2cc796f64edd 100644 FINAL_LIBRARY = "webrtc" -@@ -41,173 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -44664,7 +48152,7 @@ index 691dd4a4489a..2cc796f64edd 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -44675,7 +48163,6 @@ index 691dd4a4489a..2cc796f64edd 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -44703,14 +48190,10 @@ index 691dd4a4489a..2cc796f64edd 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -44747,9 +48230,6 @@ index 691dd4a4489a..2cc796f64edd 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -44768,6 +48248,24 @@ index 691dd4a4489a..2cc796f64edd 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -44801,8 +48299,7 @@ index 691dd4a4489a..2cc796f64edd 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -44820,34 +48317,40 @@ index 691dd4a4489a..2cc796f64edd 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 398a0250cf27..9ce55320c109 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 9b90bca379fd..af0fce3d5e23 100644 +--- third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -44856,17 +48359,30 @@ index 398a0250cf27..9ce55320c109 100644 FINAL_LIBRARY = "webrtc" -@@ -40,106 +49,16 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" - --if CONFIG["OS_TARGET"] == "Darwin": +-if CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" - ] - +-if CONFIG["OS_TARGET"] == "Darwin": +- - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -44884,7 +48400,6 @@ index 398a0250cf27..9ce55320c109 100644 - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_GNU_SOURCE"] = True - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True @@ -44892,11 +48407,8 @@ index 398a0250cf27..9ce55320c109 100644 - -if CONFIG["OS_TARGET"] == "OpenBSD": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -44931,6 +48443,38 @@ index 398a0250cf27..9ce55320c109 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - @@ -44938,8 +48482,8 @@ index 398a0250cf27..9ce55320c109 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True - +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -44949,39 +48493,58 @@ index 398a0250cf27..9ce55320c109 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - -- DEFINES["USE_X11"] = "1" +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2", - "-msse2" - ] - +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86_64": - - CXXFLAGS += [ - "-msse2" -diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build -index d5e8525ed124..93b7519e78a9 100644 ---- third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build -+++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build -@@ -13,10 +13,20 @@ AllowCompilerWarnings() - +- +- 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 ab0ca7113f60..f5628add5044 100644 +--- third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" + DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +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_USE_X11"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True @@ -44990,60 +48553,28 @@ index d5e8525ed124..93b7519e78a9 100644 FINAL_LIBRARY = "webrtc" -@@ -26,12 +36,23 @@ LOCAL_INCLUDES += [ - "/ipc/chromium/src", - "/media/libyuv/", - "/media/libyuv/libyuv/include/", -+ "/media/libyuv/libyuv/include/", - "/third_party/libwebrtc/", - "/third_party/libwebrtc/third_party/abseil-cpp/", -- "/third_party/pipewire/", - "/tools/profiler/public" - ] - -+OS_LIBS += [ -+ "X11", -+ "Xcomposite", -+ "Xdamage", -+ "Xext", -+ "Xfixes", -+ "Xrandr", -+ "Xrender", -+ "Xtst" -+] -+ - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc", - "/third_party/libwebrtc/modules/desktop_capture/capture_result_desktop_capturer_wrapper.cc", -@@ -49,10 +70,23 @@ UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc", - "/third_party/libwebrtc/modules/desktop_capture/full_screen_application_handler.cc", - "/third_party/libwebrtc/modules/desktop_capture/full_screen_window_detector.cc", -+ "/third_party/libwebrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc", -+ "/third_party/libwebrtc/modules/desktop_capture/linux/screen_capturer_x11.cc", -+ "/third_party/libwebrtc/modules/desktop_capture/linux/shared_x_display.cc", -+ "/third_party/libwebrtc/modules/desktop_capture/linux/window_capturer_x11.cc", -+ "/third_party/libwebrtc/modules/desktop_capture/linux/window_finder_x11.cc", -+ "/third_party/libwebrtc/modules/desktop_capture/linux/window_list_utils.cc", -+ "/third_party/libwebrtc/modules/desktop_capture/linux/x_atom_cache.cc", -+ "/third_party/libwebrtc/modules/desktop_capture/linux/x_error_trap.cc", -+ "/third_party/libwebrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc", -+ "/third_party/libwebrtc/modules/desktop_capture/linux/x_window_property.cc", - "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor.cc", -+ "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc", - "/third_party/libwebrtc/modules/desktop_capture/resolution_tracker.cc", - "/third_party/libwebrtc/modules/desktop_capture/rgba_color.cc", - "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_helper.cc", -+ "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc", -+ "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc", - "/third_party/libwebrtc/modules/desktop_capture/window_finder.cc" - ] - -@@ -65,181 +99,19 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -50,190 +59,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" - +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -45053,12 +48584,6 @@ index d5e8525ed124..93b7519e78a9 100644 - 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/full_screen_mac_application_handler.cc", -- "/third_party/libwebrtc/modules/desktop_capture/mac/window_list_utils.cc" -- ] -- -if CONFIG["OS_TARGET"] == "Linux": - - DEFINES["USE_AURA"] = "1" @@ -45075,63 +48600,451 @@ index d5e8525ed124..93b7519e78a9 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc", -- "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc", -- "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("audio_processing_gn") +diff --git third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build +index f0af20c33521..0e0173197c5f 100644 +--- third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("audio_processing_statistics_gn") +diff --git third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build +index 3e57c48b6fc4..3ceff91af48f 100644 +--- third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True -- DEFINES["WEBRTC_USE_PIPEWIRE"] = True -- DEFINES["WEBRTC_USE_X11"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "X11", -- "Xcomposite", -- "Xdamage", -- "Xext", -- "Xfixes", -- "Xrandr", -- "Xrender", -- "Xtst" -- ] -- -- SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/screen_capturer_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/shared_x_display.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/window_capturer_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/window_finder_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/window_list_utils.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x_atom_cache.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x_error_trap.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x_window_property.cc", -- "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc", -- "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc", -- "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc" -- ] -- -if CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True @@ -45160,102 +49073,19812 @@ index d5e8525ed124..93b7519e78a9 100644 - - OS_LIBS += [ - "crypt32", -- "d3d11", -- "dxgi", - "iphlpapi", - "secur32", - "winmm" - ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 fcbe873d276a..f87fc5607282 100644 +--- third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build +@@ -12,12 +12,21 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" + DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" ++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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 4c8aac9c3dad..28352a6c74f4 100644 +--- third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 12076eedcb58..467f6e1046bb 100644 +--- third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build +@@ -12,12 +12,21 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" + DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" ++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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -56,190 +65,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("ns_gn") +diff --git third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build +index 3e4fa4ca518f..3bd588630b7e 100644 +--- third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("optionally_built_submodule_creators_gn") +diff --git third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build +index ec35734b6dfc..de1436046491 100644 +--- third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("rms_level_gn") +diff --git third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build +index 5988e89a6a2a..5b680cbdd1fb 100644 +--- third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- + Library("transient_suppressor_api_gn") +diff --git third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build +index ee6b82a2f629..d7a2d68e8bf0 100644 +--- third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -47,190 +56,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("transient_suppressor_impl_gn") +diff --git third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build +index e2abcb849006..6deaa3bbf6a4 100644 +--- third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("voice_probability_delay_unit_gn") +diff --git third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build +index 8cf3aaefeb48..ae86ec0ff176 100644 +--- third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 11294e2aefb8..0d5e4b712c18 100644 +--- third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 02898359bf06..7d5ad6e0e09e 100644 +--- third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("pffft_wrapper_gn") +diff --git third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build +index 0e76427c6e5f..b452ab92154e 100644 +--- third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build ++++ third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -50,190 +59,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 9633f1ef4819..02587d185dd1 100644 +--- third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build ++++ third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build +@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 f6520bf35800..0b35f2f82c75 100644 +--- third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build ++++ third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 15f5a583ef24..ff1a426bf5d3 100644 +--- third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build ++++ third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build +@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 b15062af41c8..3e8439f74637 100644 +--- third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build ++++ third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build +@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -49,190 +58,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 973d4bf32fab..49adaa09b004 100644 +--- third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build ++++ third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build +@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 829ff47d87db..3f777466098c 100644 +--- third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build ++++ third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("link_capacity_estimator_gn") +diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build +index aae4b8252060..0cad7d4a534c 100644 +--- third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build ++++ third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build +@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("loss_based_bwe_v1_gn") +diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build +index 5728e0c4b27d..da1bee07288c 100644 +--- third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build ++++ third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 4f4f573cd902..51646a517e70 100644 +--- third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build ++++ third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 e189363d3ea8..5cf159041ae8 100644 +--- third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build ++++ third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 c93e412e836f..0b6eb6ed39e9 100644 +--- third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build ++++ third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build +@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 6ee156d2f828..313ac07d0c15 100644 +--- third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build ++++ third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 eb5a2a87e058..b4e083731eed 100644 +--- third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build ++++ third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 06e178901e14..8c38587543bd 100644 +--- third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build ++++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build +@@ -12,12 +12,21 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_AVX2"] = True + DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" + DEFINES["WEBRTC_LIBRARY_IMPL"] = True + DEFINES["WEBRTC_MOZILLA_BUILD"] = True + DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" ++DEFINES["WEBRTC_POSIX"] = True + DEFINES["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 = "webrtc" + +@@ -44,110 +53,23 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" ++ DEFINES["_DEBUG"] = True + +-if CONFIG["OS_TARGET"] == "Darwin": ++if CONFIG["CPU_ARCH"] == "x86": + + CXXFLAGS += [ ++ "-msse2", + "-msse2" + ] + +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_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": ++if CONFIG["CPU_ARCH"] == "x86_64": + + CXXFLAGS += [ + "-msse2" + ] + +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +- +- CXXFLAGS += [ +- "-msse2", +- "-msse2" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +- +- CXXFLAGS += [ +- "-msse2" +- ] +- + Library("desktop_capture_differ_sse2_gn") +diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build +index 8c56b6b8e5a4..a94fc562734c 100644 +--- third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build ++++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build +@@ -14,11 +14,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -70,554 +79,39 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/mac/desktop_configuration_monitor.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": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +- 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": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "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", +- "Xtst" +- ] +- +- 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_error_trap.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc", +- "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc", +- "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.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["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "d3d11", +- "dxgi", +- "iphlpapi", +- "secur32", +- "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/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["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- DEFINES["WEBRTC_USE_PIPEWIRE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +- LOCAL_INCLUDES += [ +- "/gfx/angle/checkout/include/", +- "/third_party/drm/drm/", +- "/third_party/drm/drm/include/", +- "/third_party/drm/drm/include/libdrm/", +- "/third_party/gbm/gbm/", +- "/third_party/libepoxy/libepoxy/include/", +- "/third_party/pipewire/" +- ] +- +- 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["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["WEBRTC_USE_PIPEWIRE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +- LOCAL_INCLUDES += [ +- "/gfx/angle/checkout/include/", +- "/third_party/drm/drm/", +- "/third_party/drm/drm/include/", +- "/third_party/drm/drm/include/libdrm/", +- "/third_party/gbm/gbm/", +- "/third_party/libepoxy/libepoxy/include/", +- "/third_party/pipewire/" +- ] +- +- 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["CPU_ARCH"] == "mips64": +- +- DEFINES["WEBRTC_USE_PIPEWIRE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +- LOCAL_INCLUDES += [ +- "/gfx/angle/checkout/include/", +- "/third_party/drm/drm/", +- "/third_party/drm/drm/include/", +- "/third_party/drm/drm/include/libdrm/", +- "/third_party/gbm/gbm/", +- "/third_party/libepoxy/libepoxy/include/", +- "/third_party/pipewire/" +- ] +- +- 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["CPU_ARCH"] == "ppc64": +- +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_USE_X11"] = True +- +- OS_LIBS += [ +- "X11", +- "Xcomposite", +- "Xdamage", +- "Xext", +- "Xfixes", +- "Xrandr", +- "Xrender", +- "Xtst" +- ] +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" +- ] +- +-if CONFIG["CPU_ARCH"] == "riscv64": +- +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_USE_X11"] = True +- +- OS_LIBS += [ +- "X11", +- "Xcomposite", +- "Xdamage", +- "Xext", +- "Xfixes", +- "Xrandr", +- "Xrender", +- "Xtst" +- ] +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" +- ] + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "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["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["WEBRTC_USE_PIPEWIRE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +- LOCAL_INCLUDES += [ +- "/gfx/angle/checkout/include/", +- "/third_party/drm/drm/", +- "/third_party/drm/drm/include/", +- "/third_party/drm/drm/include/libdrm/", +- "/third_party/gbm/gbm/", +- "/third_party/libepoxy/libepoxy/include/", +- "/third_party/pipewire/" +- ] +- +- 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["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +- + CXXFLAGS += [ + "-msse2" + ] + +- DEFINES["WEBRTC_USE_PIPEWIRE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +- LOCAL_INCLUDES += [ +- "/gfx/angle/checkout/include/", +- "/third_party/drm/drm/", +- "/third_party/drm/drm/include/", +- "/third_party/drm/drm/include/libdrm/", +- "/third_party/gbm/gbm/", +- "/third_party/libepoxy/libepoxy/include/", +- "/third_party/pipewire/" +- ] +- +- 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["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["WEBRTC_USE_PIPEWIRE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +- LOCAL_INCLUDES += [ +- "/gfx/angle/checkout/include/", +- "/third_party/drm/drm/", +- "/third_party/drm/drm/include/", +- "/third_party/drm/drm/include/libdrm/", +- "/third_party/gbm/gbm/", +- "/third_party/libepoxy/libepoxy/include/", +- "/third_party/pipewire/" +- ] +- +- 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["CPU_ARCH"] == "aarch64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_USE_X11"] = True +- +- OS_LIBS += [ +- "X11", +- "Xcomposite", +- "Xdamage", +- "Xext", +- "Xfixes", +- "Xrandr", +- "Xrender", +- "Xtst" +- ] +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" +- ] +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_USE_X11"] = True +- +- OS_LIBS += [ +- "X11", +- "Xcomposite", +- "Xdamage", +- "Xext", +- "Xfixes", +- "Xrandr", +- "Xrender", +- "Xtst" +- ] +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" +- ] +- +-if CONFIG["CPU_ARCH"] == "mips32" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_USE_X11"] = True +- +- OS_LIBS += [ +- "X11", +- "Xcomposite", +- "Xdamage", +- "Xext", +- "Xfixes", +- "Xrandr", +- "Xrender", +- "Xtst" +- ] ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +-if CONFIG["CPU_ARCH"] == "mips64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_USE_X11"] = True +- +- OS_LIBS += [ +- "X11", +- "Xcomposite", +- "Xdamage", +- "Xext", +- "Xfixes", +- "Xrandr", +- "Xrender", +- "Xtst" +- ] ++if not CONFIG["MOZ_X11"] and CONFIG["OS_TARGET"] == "FreeBSD": + + UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" ++ "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_null.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_null.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/window_capturer_null.cc" + ] + +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + DEFINES["WEBRTC_USE_X11"] = True +@@ -633,33 +127,8 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGE + "Xtst" + ] + +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_USE_X11"] = True +- +- OS_LIBS += [ +- "X11", +- "Xcomposite", +- "Xdamage", +- "Xext", +- "Xfixes", +- "Xrandr", +- "Xrender", +- "Xtst" ++ SOURCES += [ ++ "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc" + ] + + UNIFIED_SOURCES += [ +@@ -672,7 +141,9 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TA + "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc", + "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc", + "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" ++ "/third_party/libwebrtc/modules/desktop_capture/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 2706bed4a65f..000000000000 +--- third_party/libwebrtc/modules/desktop_capture/desktop_capture_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. ### +- +-CMMFLAGS += [ +- "-fobjc-arc" +-] +- +-COMPILE_FLAGS["OS_INCLUDES"] = [] +-AllowCompilerWarnings() +- +-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True +-DEFINES["RTC_ENABLE_VP9"] = True +-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" +-DEFINES["WEBRTC_LIBRARY_IMPL"] = True +-DEFINES["WEBRTC_MAC"] = True +-DEFINES["WEBRTC_MOZILLA_BUILD"] = True +-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +-DEFINES["WEBRTC_POSIX"] = True +-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +-DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +-DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +-DEFINES["__STDC_CONSTANT_MACROS"] = True +-DEFINES["__STDC_FORMAT_MACROS"] = True +- +-FINAL_LIBRARY = "webrtc" +- +- +-LOCAL_INCLUDES += [ +- "!/ipc/ipdl/_ipdlheaders", +- "!/third_party/libwebrtc/gen", +- "/ipc/chromium/src", +- "/third_party/libwebrtc/", +- "/third_party/libwebrtc/sdk/objc/", +- "/third_party/libwebrtc/sdk/objc/base/", +- "/third_party/libwebrtc/third_party/abseil-cpp/", +- "/tools/profiler/public" +-] +- +-UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/mac/desktop_configuration.mm", +- "/third_party/libwebrtc/modules/desktop_capture/mac/desktop_frame_cgimage.mm", +- "/third_party/libwebrtc/modules/desktop_capture/mac/desktop_frame_iosurface.mm", +- "/third_party/libwebrtc/modules/desktop_capture/mac/desktop_frame_provider.mm", +- "/third_party/libwebrtc/modules/desktop_capture/mac/screen_capturer_mac.mm", +- "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_mac.mm", +- "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_darwin.mm", +- "/third_party/libwebrtc/modules/desktop_capture/window_capturer_mac.mm", +- "/third_party/libwebrtc/modules/desktop_capture/window_finder_mac.mm" +-] +- +-if not CONFIG["MOZ_DEBUG"]: +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" +- DEFINES["NDEBUG"] = True +- DEFINES["NVALGRIND"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1": +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- DEFINES["_DEBUG"] = True +- +-if CONFIG["CPU_ARCH"] == "aarch64": +- +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["CPU_ARCH"] == "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 59c2ba037b83..4458ad4e5673 100644 +--- third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build ++++ third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -49,165 +58,31 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- DEFINES["_GNU_SOURCE"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "ppc64": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "riscv64": +- +- DEFINES["USE_X11"] = "1" + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "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["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +- + CXXFLAGS += [ + "-msse2" + ] + +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "mips32" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "mips64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["USE_X11"] = "1" ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +diff --git third_party/libwebrtc/modules/module_api_gn/moz.build third_party/libwebrtc/modules/module_api_gn/moz.build +index 3b999fdfdfe9..b5cd5bd51eb9 100644 +--- third_party/libwebrtc/modules/module_api_gn/moz.build ++++ third_party/libwebrtc/modules/module_api_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- + Library("module_api_gn") +diff --git third_party/libwebrtc/modules/module_api_public_gn/moz.build third_party/libwebrtc/modules/module_api_public_gn/moz.build +index 6d3952410c70..6d2484302b75 100644 +--- third_party/libwebrtc/modules/module_api_public_gn/moz.build ++++ third_party/libwebrtc/modules/module_api_public_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- + Library("module_api_public_gn") +diff --git third_party/libwebrtc/modules/module_fec_api_gn/moz.build third_party/libwebrtc/modules/module_fec_api_gn/moz.build +index 3badc9ded12e..b50fec7f7d98 100644 +--- third_party/libwebrtc/modules/module_fec_api_gn/moz.build ++++ third_party/libwebrtc/modules/module_fec_api_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- + Library("module_fec_api_gn") +diff --git third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build +index 17d4371d72e0..f42d208ca469 100644 +--- third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build ++++ third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + 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 61ece82430a2..5605df303cd7 100644 +--- third_party/libwebrtc/modules/pacing/pacing_gn/moz.build ++++ third_party/libwebrtc/modules/pacing/pacing_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -50,190 +59,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("pacing_gn") +diff --git third_party/libwebrtc/modules/portal/portal_gn/moz.build third_party/libwebrtc/modules/portal/portal_gn/moz.build +deleted file mode 100644 +index 77603c780bdc..000000000000 +--- third_party/libwebrtc/modules/portal/portal_gn/moz.build ++++ /dev/null +@@ -1,109 +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. ### +-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": +- CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] +- +-COMPILE_FLAGS["OS_INCLUDES"] = [] +-AllowCompilerWarnings() +- +-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True +-DEFINES["RTC_ENABLE_VP9"] = True +-DEFINES["USE_AURA"] = "1" +-DEFINES["USE_GLIB"] = "1" +-DEFINES["USE_NSS_CERTS"] = "1" +-DEFINES["USE_OZONE"] = "1" +-DEFINES["USE_UDEV"] = True +-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" +-DEFINES["WEBRTC_LIBRARY_IMPL"] = True +-DEFINES["WEBRTC_LINUX"] = True +-DEFINES["WEBRTC_MOZILLA_BUILD"] = True +-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +-DEFINES["WEBRTC_POSIX"] = True +-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +-DEFINES["WEBRTC_USE_PIPEWIRE"] = True +-DEFINES["_FILE_OFFSET_BITS"] = "64" +-DEFINES["_GNU_SOURCE"] = True +-DEFINES["_LARGEFILE64_SOURCE"] = True +-DEFINES["_LARGEFILE_SOURCE"] = True +-DEFINES["__STDC_CONSTANT_MACROS"] = True +-DEFINES["__STDC_FORMAT_MACROS"] = True +- +-FINAL_LIBRARY = "webrtc" +- +- +-LOCAL_INCLUDES += [ +- "!/ipc/ipdl/_ipdlheaders", +- "!/third_party/libwebrtc/gen", +- "/gfx/angle/checkout/include/", +- "/ipc/chromium/src", +- "/third_party/drm/drm/", +- "/third_party/drm/drm/include/", +- "/third_party/drm/drm/include/libdrm/", +- "/third_party/gbm/gbm/", +- "/third_party/libepoxy/libepoxy/include/", +- "/third_party/libwebrtc/", +- "/third_party/libwebrtc/third_party/abseil-cpp/", +- "/third_party/pipewire/", +- "/tools/profiler/public" +-] +- +-UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/portal/pipewire_utils.cc", +- "/third_party/libwebrtc/modules/portal/scoped_glib.cc", +- "/third_party/libwebrtc/modules/portal/xdg_desktop_portal_utils.cc" +-] +- +-if not CONFIG["MOZ_DEBUG"]: +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" +- DEFINES["NDEBUG"] = True +- DEFINES["NVALGRIND"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1": +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- DEFINES["_DEBUG"] = True +- +-if CONFIG["CPU_ARCH"] == "aarch64": +- +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["MIPS32_LE"] = True +- DEFINES["MIPS_FPU_LE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86": +- +- CXXFLAGS += [ +- "-msse2" +- ] +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-Library("portal_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 e572e90c311a..712c9fe0bacd 100644 +--- third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build ++++ third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build +@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -55,190 +64,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("remote_bitrate_estimator_gn") +diff --git third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build +index f03986e482da..8cfbc6b1ddb3 100644 +--- third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build ++++ third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("leb128_gn") +diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build +index da69b456d323..3a86740343d2 100644 +--- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build ++++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -85,190 +94,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("rtp_rtcp_format_gn") +diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build +index 5683b643c091..4ca036ae5563 100644 +--- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build ++++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build +@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -95,190 +104,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("rtp_rtcp_gn") +diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build +index 99447dd14992..4743dce9a666 100644 +--- third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build ++++ third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("rtp_video_header_gn") +diff --git third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build +index 40022820400d..a8dff360398f 100644 +--- third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build ++++ third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("fft_gn") +diff --git third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build +index 3b2ee5ee3d97..af84f0dd5f5a 100644 +--- third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build ++++ third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("g711_3p_gn") +diff --git third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build +index f40abbac1407..d320b4ef86f8 100644 +--- third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build ++++ third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -47,175 +56,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + 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 b932f5da73da..49d074bc4db2 100644 +--- third_party/libwebrtc/modules/utility/utility_gn/moz.build ++++ third_party/libwebrtc/modules/utility/utility_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + 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 cd5557b826da..a481fb0e5df1 100644 +--- third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build ++++ third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -30,6 +39,13 @@ LOCAL_INCLUDES += [ + "/tools/profiler/public" + ] + ++UNIFIED_SOURCES += [ ++ "/third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc", ++ "/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc", ++ "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc", ++ "/third_party/libwebrtc/modules/video_capture/linux/video_capture_v4l2.cc" ++] ++ + if not CONFIG["MOZ_DEBUG"]: + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" +@@ -39,216 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "GLESv2", +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc", +- "/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc", +- "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc", +- "/third_party/libwebrtc/modules/video_capture/linux/video_capture_v4l2.cc" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc", +- "/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc", +- "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc", +- "/third_party/libwebrtc/modules/video_capture/linux/video_capture_v4l2.cc" +- ] +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "ole32", +- "oleaut32", +- "secur32", +- "strmiids", +- "user32", +- "winmm" +- ] +- +- SOURCES += [ +- "/third_party/libwebrtc/modules/video_capture/windows/device_info_ds.cc", +- "/third_party/libwebrtc/modules/video_capture/windows/help_functions_ds.cc", +- "/third_party/libwebrtc/modules/video_capture/windows/sink_filter_ds.cc" +- ] +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/video_capture/windows/video_capture_ds.cc", +- "/third_party/libwebrtc/modules/video_capture/windows/video_capture_factory_windows.cc" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + ++ CXXFLAGS += [ ++ "-msse2" ++ ] ++ + DEFINES["WEBRTC_ENABLE_AVX2"] = True + + if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +- +- CXXFLAGS += [ +- "-msse2" +- ] +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- + Library("video_capture_internal_impl_gn") +diff --git third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build +index 8aa245b127c1..1f157fe113a0 100644 +--- third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build ++++ third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -47,191 +56,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "GLESv2", +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("video_capture_module_gn") +diff --git third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build +index 9020f11067fc..fcc8a73423ab 100644 +--- third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("chain_diff_calculator_gn") +diff --git third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build +index 7c87e340afde..b4f0490937ff 100644 +--- third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- + Library("codec_globals_headers_gn") +diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build +index cc297017e3d5..12901738a75f 100644 +--- third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("av1_svc_config_gn") +diff --git third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build +index 159b77d10cab..217d265bacee 100644 +--- third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("encoded_frame_gn") +diff --git third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build +index c518044c948a..74af6c5dc520 100644 +--- third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("frame_dependencies_calculator_gn") +diff --git third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build +index d6342c48f713..544a97f60aad 100644 +--- third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("frame_helpers_gn") +diff --git third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build +index 33e763a48d7e..e1db6e2439d5 100644 +--- third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 9561cb88e8eb..65e5b4757c29 100644 +--- third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 f786b1161681..e6d655af95dc 100644 +--- third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 a3e45b1cd7ba..12c34079a6e6 100644 +--- third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -50,183 +59,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 42b8307362fe..9348473d2af9 100644 +--- third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("scalable_video_controller_gn") +diff --git third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build +index 5d7d952a69b9..7157f0bd74ba 100644 +--- third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("svc_rate_allocator_gn") +diff --git third_party/libwebrtc/modules/video_coding/timing/codec_timer_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/codec_timer_gn/moz.build +index 59498feb917b..e0a3f25c615c 100644 +--- third_party/libwebrtc/modules/video_coding/timing/codec_timer_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/timing/codec_timer_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("codec_timer_gn") +diff --git third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build +index ecdcfc93e128..47bc48987a96 100644 +--- third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("frame_delay_variation_kalman_filter_gn") +diff --git third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_gn/moz.build +index 765d42aade9c..2fc89d07d0c4 100644 +--- third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("inter_frame_delay_gn") +diff --git third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build +index a0d6154d785f..b158655cdd5d 100644 +--- third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 488a49d9c26b..bc1e328ba2ec 100644 +--- third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 4cd085dd0962..2865a2290f7d 100644 +--- third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 8ab43fb7484d..4fd77d42f049 100644 +--- third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 f01783ebd1f3..89deb11da94a 100644 +--- third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 a6034ad47653..0e51e76cfcea 100644 +--- third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -59,191 +68,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "GLESv2", +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 1de983a78646..92ff8a1d9819 100644 +--- third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -54,190 +63,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("video_coding_utility_gn") +diff --git third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build +index 03437c5d57de..2adbff018445 100644 +--- third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "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 db366355de5e..8988f6d4b0ac 100644 +--- third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("webrtc_vp8_gn") +diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build +index 3d5642df008a..3efc79029a22 100644 +--- third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + 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 db3848fb5759..64f1526a2eb2 100644 +--- third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -48,190 +57,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("webrtc_vp8_temporal_layers_gn") +diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build +index f470652e6d6c..03f7307e20ea 100644 +--- third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -48,191 +57,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "GLESv2", +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("webrtc_vp9_gn") +diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build +index 77a0c38f9903..0390ceb82364 100644 +--- third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "GLESv2", +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("webrtc_vp9_helpers_gn") +diff --git third_party/libwebrtc/moz.build third_party/libwebrtc/moz.build +index 0920c2883cec..7579b40c86b7 100644 +--- third_party/libwebrtc/moz.build ++++ third_party/libwebrtc/moz.build +@@ -262,6 +262,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", +@@ -456,86 +458,14 @@ DIRS += [ + "/third_party/libwebrtc/webrtc_gn" + ] + +-if CONFIG["OS_TARGET"] == "Android": +- +- DIRS += [ +- "/third_party/libwebrtc/rtc_base/ifaddrs_android_gn" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DIRS += [ +- "/third_party/libwebrtc/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["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android": ++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "FreeBSD": + + DIRS += [ + "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", + "/third_party/libwebrtc/common_audio/common_audio_neon_gn" + ] + +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- 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["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- +- 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["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android": +- +- 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["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Darwin": +- +- DIRS += [ +- "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", +- "/third_party/libwebrtc/common_audio/common_audio_neon_gn" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Darwin": ++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD": + + DIRS += [ + "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", +@@ -545,128 +475,7 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Darwin": + "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn" + ] + +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- 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/drm/drm_gn", +- "/third_party/libwebrtc/third_party/gbm/gbm_gn", +- "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn", +- "/third_party/libwebrtc/third_party/pipewire/pipewire_gn" +- ] +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- 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/drm/drm_gn", +- "/third_party/libwebrtc/third_party/gbm/gbm_gn", +- "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn", +- "/third_party/libwebrtc/third_party/pipewire/pipewire_gn" +- ] +- +-if CONFIG["CPU_ARCH"] == "mips32" and CONFIG["OS_TARGET"] == "Linux": +- +- 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/drm/drm_gn", +- "/third_party/libwebrtc/third_party/gbm/gbm_gn", +- "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn", +- "/third_party/libwebrtc/third_party/pipewire/pipewire_gn" +- ] +- +-if CONFIG["CPU_ARCH"] == "mips64" and CONFIG["OS_TARGET"] == "Linux": +- +- 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/drm/drm_gn", +- "/third_party/libwebrtc/third_party/gbm/gbm_gn", +- "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn", +- "/third_party/libwebrtc/third_party/pipewire/pipewire_gn" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +- +- DIRS += [ +- "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", +- "/third_party/libwebrtc/common_audio/common_audio_sse2_gn", +- "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn", +- "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn", +- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn", +- "/third_party/libwebrtc/modules/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/drm/drm_gn", +- "/third_party/libwebrtc/third_party/gbm/gbm_gn", +- "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn", +- "/third_party/libwebrtc/third_party/pipewire/pipewire_gn" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +- +- DIRS += [ +- "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", +- "/third_party/libwebrtc/common_audio/common_audio_sse2_gn", +- "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn", +- "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn", +- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn", +- "/third_party/libwebrtc/modules/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/drm/drm_gn", +- "/third_party/libwebrtc/third_party/gbm/gbm_gn", +- "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn", +- "/third_party/libwebrtc/third_party/pipewire/pipewire_gn" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DIRS += [ +- "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", +- "/third_party/libwebrtc/common_audio/common_audio_neon_gn" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DIRS += [ +- "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", +- "/third_party/libwebrtc/common_audio/common_audio_sse2_gn", +- "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn", +- "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn", +- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "WINNT": +- +- DIRS += [ +- "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", +- "/third_party/libwebrtc/common_audio/common_audio_neon_gn" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "WINNT": +- +- 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["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "WINNT": ++if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "FreeBSD": + + DIRS += [ + "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", +@@ -675,17 +484,3 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "WINNT": + "/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["CPU_ARCH"] == "ppc64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DIRS += [ +- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", +- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn" +- ] +- +-if CONFIG["CPU_ARCH"] == "riscv64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DIRS += [ +- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", +- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn" +- ] +diff --git third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build +index b93fca231d69..be25257373e5 100644 +--- third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build ++++ third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- + Library("async_packet_socket_gn") +diff --git third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build +index 8e1b4e454d4d..ee64165c31d3 100644 +--- third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build ++++ third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "GLESv2", +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("async_resolver_interface_gn") +diff --git third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build +index d5cc0504b1d5..41df619ecefa 100644 +--- third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build ++++ third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("audio_format_to_string_gn") +diff --git third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build +index 858cc304ba75..9d16e13e8efa 100644 +--- third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build ++++ third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("bit_buffer_gn") +diff --git third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build +index 77059cd34301..c5dabe6ad79f 100644 +--- third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build ++++ third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("bitstream_reader_gn") +diff --git third_party/libwebrtc/rtc_base/buffer_gn/moz.build third_party/libwebrtc/rtc_base/buffer_gn/moz.build +index c378c3a0b2ac..31ea8d65c7ce 100644 +--- third_party/libwebrtc/rtc_base/buffer_gn/moz.build ++++ third_party/libwebrtc/rtc_base/buffer_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- + Library("buffer_gn") +diff --git third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build +index 43ed668b71ad..292e0dc836d1 100644 +--- third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build ++++ third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("byte_buffer_gn") +diff --git third_party/libwebrtc/rtc_base/byte_order_gn/moz.build third_party/libwebrtc/rtc_base/byte_order_gn/moz.build +index b49346b1540f..c8dbc51e612a 100644 +--- third_party/libwebrtc/rtc_base/byte_order_gn/moz.build ++++ third_party/libwebrtc/rtc_base/byte_order_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- + Library("byte_order_gn") +diff --git third_party/libwebrtc/rtc_base/checks_gn/moz.build third_party/libwebrtc/rtc_base/checks_gn/moz.build +index 769362b62a5a..97a3da2b775a 100644 +--- third_party/libwebrtc/rtc_base/checks_gn/moz.build ++++ third_party/libwebrtc/rtc_base/checks_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("checks_gn") +diff --git third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build +index 5fd417eefd5a..b997040b164c 100644 +--- third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build ++++ third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- + Library("compile_assert_c_gn") +diff --git third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build +index 2d02d778fffe..07b174d0c11e 100644 +--- third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build ++++ third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("flat_containers_internal_gn") +diff --git third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build +index f2d8ed054e00..df8ec55e92af 100644 +--- third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build ++++ third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- + Library("flat_map_gn") +diff --git third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build +index 794ed8feb87a..6d2002a94fbc 100644 +--- third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build ++++ third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- + Library("flat_set_gn") +diff --git third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build +index eecb53c907da..bcad4a983179 100644 +--- third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build ++++ third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("copy_on_write_buffer_gn") +diff --git third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build +index c8749bb51055..95e71cdfe9cf 100644 +--- third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build ++++ third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("criticalsection_gn") +diff --git third_party/libwebrtc/rtc_base/divide_round_gn/moz.build third_party/libwebrtc/rtc_base/divide_round_gn/moz.build +index 8bc1e665d50d..729bb35b5b49 100644 +--- third_party/libwebrtc/rtc_base/divide_round_gn/moz.build ++++ third_party/libwebrtc/rtc_base/divide_round_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- + Library("divide_round_gn") +diff --git third_party/libwebrtc/rtc_base/dscp_gn/moz.build third_party/libwebrtc/rtc_base/dscp_gn/moz.build +index b8b28d8d0161..4050d593d1b1 100644 +--- third_party/libwebrtc/rtc_base/dscp_gn/moz.build ++++ third_party/libwebrtc/rtc_base/dscp_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -- SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc" -- ] +-if CONFIG["OS_TARGET"] == "Linux": - -- 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/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/window_capture_utils.cc", -- "/third_party/libwebrtc/modules/desktop_capture/win/window_capturer_win_gdi.cc", -- "/third_party/libwebrtc/modules/desktop_capture/win/window_capturer_win_wgc.cc", -- "/third_party/libwebrtc/modules/desktop_capture/window_capturer_win.cc", -- "/third_party/libwebrtc/modules/desktop_capture/window_finder_win.cc" -- ] +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": DEFINES["WEBRTC_ARCH_ARM64"] = True DEFINES["WEBRTC_HAS_NEON"] = True -+ DEFINES["WEBRTC_USE_PIPEWIRE"] = True -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -+ LOCAL_INCLUDES += [ -+ "/third_party/pipewire/", -+ "/third_party/pipewire/" - ] - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True -- DEFINES["WEBRTC_USE_PIPEWIRE"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True - DEFINES["_GNU_SOURCE"] = True - - SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc" - ] -@@ -251,71 +123,22 @@ if CONFIG["CPU_ARCH"] == "arm": +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True - if CONFIG["CPU_ARCH"] == "ppc64": + if CONFIG["CPU_ARCH"] == "x86": -- DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_USE_X11"] = True -- -- OS_LIBS += [ -- "X11", -- "Xcomposite", -- "Xdamage", -- "Xext", -- "Xfixes", -- "Xrandr", -- "Xrender", -- "Xtst" -- ] +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/screen_capturer_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/shared_x_display.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/window_capturer_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/window_finder_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/window_list_utils.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x_atom_cache.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x_error_trap.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x_window_property.cc" -- ] +- DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - @@ -45273,194 +68896,58 @@ index d5e8525ed124..93b7519e78a9 100644 - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_USE_PIPEWIRE"] = True -- DEFINES["_GNU_SOURCE"] = True -- -- SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc" -+ LOCAL_INCLUDES += [ -+ "/third_party/pipewire/" - ] - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc" -- ] -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - - DEFINES["WEBRTC_USE_PIPEWIRE"] = True -- DEFINES["_GNU_SOURCE"] = True -+ -+ LOCAL_INCLUDES += [ -+ "/third_party/pipewire/", -+ "/third_party/pipewire/" -+ ] - - SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc" -@@ -326,10 +149,14 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - "/third_party/libwebrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc" - ] - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86_64": - - DEFINES["WEBRTC_USE_PIPEWIRE"] = True -- DEFINES["_GNU_SOURCE"] = True -+ -+ LOCAL_INCLUDES += [ -+ "/third_party/pipewire/", -+ "/third_party/pipewire/" -+ ] +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc" -@@ -340,120 +167,4 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - "/third_party/libwebrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc" - ] + DEFINES["USE_X11"] = "1" --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_USE_X11"] = True +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -- "X11", -- "Xcomposite", -- "Xdamage", -- "Xext", -- "Xfixes", -- "Xrandr", -- "Xrender", -- "Xtst" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/screen_capturer_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/shared_x_display.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/window_capturer_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/window_finder_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/window_list_utils.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x_atom_cache.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x_error_trap.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x_window_property.cc" +- "android_support", +- "unwind" - ] - --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_USE_X11"] = True +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -- "X11", -- "Xcomposite", -- "Xdamage", -- "Xext", -- "Xfixes", -- "Xrandr", -- "Xrender", -- "Xtst" +- "android_support" - ] - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/screen_capturer_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/shared_x_display.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/window_capturer_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/window_finder_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/window_list_utils.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x_atom_cache.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x_error_trap.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x_window_property.cc" -- ] +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- DEFINES["_GNU_SOURCE"] = True - -- DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_USE_X11"] = True +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- OS_LIBS += [ -- "X11", -- "Xcomposite", -- "Xdamage", -- "Xext", -- "Xfixes", -- "Xrandr", -- "Xrender", -- "Xtst" -- ] +- DEFINES["_GNU_SOURCE"] = True - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/screen_capturer_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/shared_x_display.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/window_capturer_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/window_finder_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/window_list_utils.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x_atom_cache.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x_error_trap.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x_window_property.cc" -- ] +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- DEFINES["_GNU_SOURCE"] = True - -- DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_USE_X11"] = True +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- OS_LIBS += [ -- "X11", -- "Xcomposite", -- "Xdamage", -- "Xext", -- "Xfixes", -- "Xrandr", -- "Xrender", -- "Xtst" -- ] +- DEFINES["_GNU_SOURCE"] = True - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/screen_capturer_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/shared_x_display.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/window_capturer_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/window_finder_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/window_list_utils.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x_atom_cache.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x_error_trap.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x_window_property.cc" -- ] -- - Library("desktop_capture_generic_gn") -diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build -index e281ba8daf2a..bdc8143dc058 100644 ---- third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build -+++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build -@@ -11,10 +11,20 @@ AllowCompilerWarnings() - + Library("dscp_gn") +diff --git third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build +index 02fe978ab08d..c655f3b43877 100644 +--- third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build ++++ third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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_USE_X11"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True @@ -45469,29 +68956,28 @@ index e281ba8daf2a..bdc8143dc058 100644 FINAL_LIBRARY = "webrtc" -@@ -27,6 +37,17 @@ LOCAL_INCLUDES += [ - "/tools/profiler/public" - ] - -+OS_LIBS += [ -+ "X11", -+ "Xcomposite", -+ "Xdamage", -+ "Xext", -+ "Xfixes", -+ "Xrandr", -+ "Xrender", -+ "Xtst" -+] -+ - if not CONFIG["MOZ_DEBUG"]: - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" -@@ -36,213 +57,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" - +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -45516,35 +69002,19 @@ index e281ba8daf2a..bdc8143dc058 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True -- DEFINES["WEBRTC_USE_X11"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "X11", -- "Xcomposite", -- "Xdamage", -- "Xext", -- "Xfixes", -- "Xrandr", -- "Xrender", -- "Xtst" -- ] -- -if CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True @@ -45572,11 +69042,6 @@ index e281ba8daf2a..bdc8143dc058 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "d3d11", -- "dxgi", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -45588,26 +69053,35 @@ index e281ba8daf2a..bdc8143dc058 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "ppc64": +-if CONFIG["CPU_ARCH"] == "mips64": - -- DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_USE_X11"] = True +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -- OS_LIBS += [ -- "X11", -- "Xcomposite", -- "Xdamage", -- "Xext", -- "Xfixes", -- "Xrandr", -- "Xrender", -- "Xtst" -- ] +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - @@ -45625,99 +69099,70 @@ index e281ba8daf2a..bdc8143dc058 100644 - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_USE_X11"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -- "X11", -- "Xcomposite", -- "Xdamage", -- "Xext", -- "Xfixes", -- "Xrandr", -- "Xrender", -- "Xtst" +- "android_support", +- "unwind" - ] - --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_USE_X11"] = True +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ -- "X11", -- "Xcomposite", -- "Xdamage", -- "Xext", -- "Xfixes", -- "Xrandr", -- "Xrender", -- "Xtst" +- "android_support" - ] - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_USE_X11"] = True +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- OS_LIBS += [ -- "X11", -- "Xcomposite", -- "Xdamage", -- "Xext", -- "Xfixes", -- "Xrandr", -- "Xrender", -- "Xtst" -- ] +- DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_USE_X11"] = True +- DEFINES["_GNU_SOURCE"] = True - -- OS_LIBS += [ -- "X11", -- "Xcomposite", -- "Xdamage", -- "Xext", -- "Xfixes", -- "Xrandr", -- "Xrender", -- "Xtst" +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" - ] -- - Library("desktop_capture_gn") -diff --git third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build -index 27fd94b5b85c..600c61f02ec3 100644 ---- third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build -+++ third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + Library("event_tracer_gn") +diff --git third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build +index 574d7d63026a..0d1253003f3d 100644 +--- third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build ++++ third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -45726,11 +69171,28 @@ index 27fd94b5b85c..600c61f02ec3 100644 FINAL_LIBRARY = "webrtc" -@@ -44,135 +53,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" - +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -45758,6 +69220,7 @@ index 27fd94b5b85c..600c61f02ec3 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -45792,6 +69255,10 @@ index 27fd94b5b85c..600c61f02ec3 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -45808,11 +69275,28 @@ index 27fd94b5b85c..600c61f02ec3 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "ppc64": +-if CONFIG["CPU_ARCH"] == "mips64": - -- DEFINES["USE_X11"] = "1" +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - @@ -45830,56 +69314,70 @@ index 27fd94b5b85c..600c61f02ec3 100644 - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["_GNU_SOURCE"] = True +- DEFINES["USE_X11"] = "1" +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - CXXFLAGS += [ "-msse2" ] -- DEFINES["_GNU_SOURCE"] = True +- OS_LIBS += [ +- "android_support" +- ] - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["USE_X11"] = "1" +- DEFINES["_GNU_SOURCE"] = 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 6ec677faa02d..f0e31a18277d 100644 ---- third_party/libwebrtc/modules/module_api_gn/moz.build -+++ third_party/libwebrtc/modules/module_api_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + Library("alr_experiment_gn") +diff --git third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build +index 34b388da69ec..e1cf8913860d 100644 +--- third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build ++++ third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -45888,7 +69386,7 @@ index 6ec677faa02d..f0e31a18277d 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -45896,7 +69394,7 @@ index 6ec677faa02d..f0e31a18277d 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -45906,6 +69404,10 @@ index 6ec677faa02d..f0e31a18277d 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -45933,6 +69435,7 @@ index 6ec677faa02d..f0e31a18277d 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -45967,6 +69470,10 @@ index 6ec677faa02d..f0e31a18277d 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -45976,9 +69483,31 @@ index 6ec677faa02d..f0e31a18277d 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -46013,6 +69542,10 @@ index 6ec677faa02d..f0e31a18277d 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -46026,30 +69559,40 @@ index 6ec677faa02d..f0e31a18277d 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 5eb4229dd18c..deb99a1aeaf7 100644 ---- third_party/libwebrtc/modules/module_api_public_gn/moz.build -+++ third_party/libwebrtc/modules/module_api_public_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("balanced_degradation_settings_gn") +diff --git third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build +index ccc00e5296a1..54cef4764697 100644 +--- third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build ++++ third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -46058,7 +69601,7 @@ index 5eb4229dd18c..deb99a1aeaf7 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -46066,7 +69609,7 @@ index 5eb4229dd18c..deb99a1aeaf7 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -46076,6 +69619,10 @@ index 5eb4229dd18c..deb99a1aeaf7 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -46103,6 +69650,7 @@ index 5eb4229dd18c..deb99a1aeaf7 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -46137,6 +69685,10 @@ index 5eb4229dd18c..deb99a1aeaf7 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -46146,179 +69698,31 @@ index 5eb4229dd18c..deb99a1aeaf7 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" -- --if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -- -- OS_LIBS += [ -- "android_support" -- ] -- --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["CPU_ARCH"] == "mips64": - - 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 0a1dad5b877b..9b9e77c3ee61 100644 ---- third_party/libwebrtc/modules/module_fec_api_gn/moz.build -+++ third_party/libwebrtc/modules/module_fec_api_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True -+DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["_FILE_OFFSET_BITS"] = "64" -+DEFINES["_LARGEFILE64_SOURCE"] = True -+DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True - - FINAL_LIBRARY = "webrtc" - -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: - if CONFIG["MOZ_DEBUG"] == "1": + if CONFIG["CPU_ARCH"] == "x86": - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" -- --if CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" -- DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True -- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_AURA"] = "1" -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_NSS_CERTS"] = "1" -- DEFINES["USE_OZONE"] = "1" -- DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - --if CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True -- DEFINES["NOMINMAX"] = True -- DEFINES["NTDDI_VERSION"] = "0x0A000000" -- DEFINES["PSAPI_VERSION"] = "2" -- DEFINES["UNICODE"] = True -- DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True -- DEFINES["WIN32"] = True -- DEFINES["WIN32_LEAN_AND_MEAN"] = True -- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" -- DEFINES["WINVER"] = "0x0A00" -- DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_RAND_S"] = True -- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True -- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True -- DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True -- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True -- DEFINES["_SECURE_ATL"] = True -- DEFINES["_UNICODE"] = True -- DEFINES["_WIN32_WINNT"] = "0x0A00" -- DEFINES["_WINDOWS"] = True -- DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": +-if CONFIG["CPU_ARCH"] == "x86_64": - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -46353,6 +69757,10 @@ index 0a1dad5b877b..9b9e77c3ee61 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -46366,30 +69774,40 @@ index 0a1dad5b877b..9b9e77c3ee61 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 b38038c227df..016c62e81d53 100644 ---- third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build -+++ third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("bandwidth_quality_scaler_settings_gn") +diff --git third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build +index 66d21c66a349..8118147f993e 100644 +--- third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build ++++ third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -46398,7 +69816,7 @@ index b38038c227df..016c62e81d53 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -46406,7 +69824,7 @@ index b38038c227df..016c62e81d53 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -46447,6 +69865,7 @@ index b38038c227df..016c62e81d53 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -46501,6 +69920,24 @@ index b38038c227df..016c62e81d53 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -46535,10 +69972,10 @@ index b38038c227df..016c62e81d53 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -46552,35 +69989,40 @@ index b38038c227df..016c62e81d53 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("interval_budget_gn") -diff --git third_party/libwebrtc/modules/pacing/pacing_gn/moz.build third_party/libwebrtc/modules/pacing/pacing_gn/moz.build -index 77f554bcaa93..b0b0e8162df2 100644 ---- third_party/libwebrtc/modules/pacing/pacing_gn/moz.build -+++ third_party/libwebrtc/modules/pacing/pacing_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("cpu_speed_experiment_gn") +diff --git third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build +index 1cf3a5d0f41f..ed59d2508985 100644 +--- third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build ++++ third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -46589,7 +70031,7 @@ index 77f554bcaa93..b0b0e8162df2 100644 FINAL_LIBRARY = "webrtc" -@@ -45,173 +54,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -46597,7 +70039,7 @@ index 77f554bcaa93..b0b0e8162df2 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -46608,7 +70050,6 @@ index 77f554bcaa93..b0b0e8162df2 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -46636,14 +70077,10 @@ index 77f554bcaa93..b0b0e8162df2 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -46680,9 +70117,6 @@ index 77f554bcaa93..b0b0e8162df2 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -46701,6 +70135,24 @@ index 77f554bcaa93..b0b0e8162df2 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -46734,8 +70186,7 @@ index 77f554bcaa93..b0b0e8162df2 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -46753,34 +70204,40 @@ index 77f554bcaa93..b0b0e8162df2 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("pacing_gn") -diff --git third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build -index 7ad9daf4dc2c..84650cb40532 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 -@@ -12,10 +12,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + + Library("encoder_info_settings_gn") +diff --git third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build +index 8147b9e99a24..3cd6aec92bc8 100644 +--- third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build ++++ third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -46789,7 +70246,7 @@ index 7ad9daf4dc2c..84650cb40532 100644 FINAL_LIBRARY = "webrtc" -@@ -51,173 +60,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,183 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -46797,7 +70254,7 @@ index 7ad9daf4dc2c..84650cb40532 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -46808,7 +70265,6 @@ index 7ad9daf4dc2c..84650cb40532 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -46836,14 +70292,10 @@ index 7ad9daf4dc2c..84650cb40532 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -46880,9 +70332,6 @@ index 7ad9daf4dc2c..84650cb40532 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -46901,6 +70350,24 @@ index 7ad9daf4dc2c..84650cb40532 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -46934,8 +70401,7 @@ index 7ad9daf4dc2c..84650cb40532 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -46953,34 +70419,40 @@ index 7ad9daf4dc2c..84650cb40532 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("remote_bitrate_estimator_gn") -diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build -index 59dfc51872bf..5d028cb933e8 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("field_trial_parser_gn") +diff --git third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build +index b8ece40f9b6e..cd41f4b0b645 100644 +--- third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build ++++ third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -46989,7 +70461,7 @@ index 59dfc51872bf..5d028cb933e8 100644 FINAL_LIBRARY = "webrtc" -@@ -81,173 +90,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -46997,7 +70469,7 @@ index 59dfc51872bf..5d028cb933e8 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -47008,7 +70480,6 @@ index 59dfc51872bf..5d028cb933e8 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -47036,14 +70507,10 @@ index 59dfc51872bf..5d028cb933e8 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -47080,9 +70547,6 @@ index 59dfc51872bf..5d028cb933e8 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -47101,6 +70565,24 @@ index 59dfc51872bf..5d028cb933e8 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -47134,8 +70616,7 @@ index 59dfc51872bf..5d028cb933e8 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -47153,34 +70634,40 @@ index 59dfc51872bf..5d028cb933e8 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("rtp_rtcp_format_gn") -diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build -index 0448d75c65be..6b3ece14f2af 100644 ---- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build -+++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build -@@ -12,10 +12,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + + Library("keyframe_interval_settings_experiment_gn") +diff --git third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build +index 0092a33c3916..0cbfa328d9ea 100644 +--- third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build ++++ third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -47189,7 +70676,7 @@ index 0448d75c65be..6b3ece14f2af 100644 FINAL_LIBRARY = "webrtc" -@@ -93,173 +102,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -47197,7 +70684,7 @@ index 0448d75c65be..6b3ece14f2af 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -47208,7 +70695,6 @@ index 0448d75c65be..6b3ece14f2af 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -47236,14 +70722,10 @@ index 0448d75c65be..6b3ece14f2af 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -47280,9 +70762,6 @@ index 0448d75c65be..6b3ece14f2af 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -47301,6 +70780,24 @@ index 0448d75c65be..6b3ece14f2af 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -47334,8 +70831,7 @@ index 0448d75c65be..6b3ece14f2af 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -47353,34 +70849,40 @@ index 0448d75c65be..6b3ece14f2af 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("rtp_rtcp_gn") -diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build -index 99b466e4f96f..8b28970b3a85 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("min_video_bitrate_experiment_gn") +diff --git third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build +index acf592c7634f..2b4feb9b7bdc 100644 +--- third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build ++++ third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -47389,7 +70891,7 @@ index 99b466e4f96f..8b28970b3a85 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -47397,7 +70899,7 @@ index 99b466e4f96f..8b28970b3a85 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -47438,6 +70940,7 @@ index 99b466e4f96f..8b28970b3a85 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -47492,6 +70995,24 @@ index 99b466e4f96f..8b28970b3a85 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -47526,10 +71047,10 @@ index 99b466e4f96f..8b28970b3a85 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -47543,35 +71064,40 @@ index 99b466e4f96f..8b28970b3a85 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("rtp_video_header_gn") -diff --git third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build -index bd5ba8d068b6..d100ead983ab 100644 ---- third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build -+++ third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("normalize_simulcast_size_experiment_gn") +diff --git third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build +index aa454826f68b..1e8451135790 100644 +--- third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build ++++ third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -47580,7 +71106,7 @@ index bd5ba8d068b6..d100ead983ab 100644 FINAL_LIBRARY = "webrtc" -@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -47588,7 +71114,7 @@ index bd5ba8d068b6..d100ead983ab 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -47598,6 +71124,10 @@ index bd5ba8d068b6..d100ead983ab 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -47625,6 +71155,7 @@ index bd5ba8d068b6..d100ead983ab 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -47659,6 +71190,10 @@ index bd5ba8d068b6..d100ead983ab 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -47668,13 +71203,31 @@ index bd5ba8d068b6..d100ead983ab 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CFLAGS += [ +- CXXFLAGS += [ - "-mfpu=neon" - ] - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -47709,10 +71262,10 @@ index bd5ba8d068b6..d100ead983ab 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -47726,35 +71279,40 @@ index bd5ba8d068b6..d100ead983ab 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("fft_gn") -diff --git third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build -index 3090f6672642..d163dfcfe2ab 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("quality_rampup_experiment_gn") +diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build +index c8c2708eb734..dcc3d66af2f3 100644 +--- third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build ++++ third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -47763,7 +71321,7 @@ index 3090f6672642..d163dfcfe2ab 100644 FINAL_LIBRARY = "webrtc" -@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -47771,7 +71329,7 @@ index 3090f6672642..d163dfcfe2ab 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -47781,6 +71339,10 @@ index 3090f6672642..d163dfcfe2ab 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -47808,6 +71370,7 @@ index 3090f6672642..d163dfcfe2ab 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -47842,6 +71405,10 @@ index 3090f6672642..d163dfcfe2ab 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -47851,13 +71418,31 @@ index 3090f6672642..d163dfcfe2ab 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CFLAGS += [ +- CXXFLAGS += [ - "-mfpu=neon" - ] - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -47892,10 +71477,10 @@ index 3090f6672642..d163dfcfe2ab 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -47909,35 +71494,40 @@ index 3090f6672642..d163dfcfe2ab 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("g711_3p_gn") -diff --git third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build -index 786091938c38..cb3415af0578 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("quality_scaler_settings_gn") +diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build +index 2a84caa1a115..f4eec0f9ca31 100644 +--- third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build ++++ third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -47946,7 +71536,7 @@ index 786091938c38..cb3415af0578 100644 FINAL_LIBRARY = "webrtc" -@@ -44,156 +53,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -47954,7 +71544,7 @@ index 786091938c38..cb3415af0578 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -47964,6 +71554,10 @@ index 786091938c38..cb3415af0578 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -47991,6 +71585,7 @@ index 786091938c38..cb3415af0578 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -48025,6 +71620,10 @@ index 786091938c38..cb3415af0578 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -48034,13 +71633,31 @@ index 786091938c38..cb3415af0578 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CFLAGS += [ +- CXXFLAGS += [ - "-mfpu=neon" - ] - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -48075,10 +71692,10 @@ index 786091938c38..cb3415af0578 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -48092,35 +71709,40 @@ index 786091938c38..cb3415af0578 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("g722_3p_gn") -diff --git third_party/libwebrtc/modules/utility/utility_gn/moz.build third_party/libwebrtc/modules/utility/utility_gn/moz.build -index 575c3b3ac226..e6a5515c0ffc 100644 ---- third_party/libwebrtc/modules/utility/utility_gn/moz.build -+++ third_party/libwebrtc/modules/utility/utility_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("quality_scaling_experiment_gn") +diff --git third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build +index 6cbe9e8474cf..768d19687442 100644 +--- third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build ++++ third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -48129,7 +71751,7 @@ index 575c3b3ac226..e6a5515c0ffc 100644 FINAL_LIBRARY = "webrtc" -@@ -40,176 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -48137,7 +71759,7 @@ index 575c3b3ac226..e6a5515c0ffc 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -48151,11 +71773,6 @@ index 575c3b3ac226..e6a5515c0ffc 100644 - "log" - ] - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/utility/source/helpers_android.cc", -- "/third_party/libwebrtc/modules/utility/source/jvm_android.cc" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -48180,13 +71797,10 @@ index 575c3b3ac226..e6a5515c0ffc 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -48223,9 +71837,6 @@ index 575c3b3ac226..e6a5515c0ffc 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -48244,6 +71855,24 @@ index 575c3b3ac226..e6a5515c0ffc 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -48278,10 +71907,10 @@ index 575c3b3ac226..e6a5515c0ffc 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -48295,35 +71924,40 @@ index 575c3b3ac226..e6a5515c0ffc 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 645c2d7c0273..2fd65278b4df 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("rate_control_settings_gn") +diff --git third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build +index aea652b1063e..faed80b04af8 100644 +--- third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build ++++ third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -48332,19 +71966,7 @@ index 645c2d7c0273..2fd65278b4df 100644 FINAL_LIBRARY = "webrtc" -@@ -27,6 +36,11 @@ LOCAL_INCLUDES += [ - "/tools/profiler/public" - ] - -+UNIFIED_SOURCES += [ -+ "/third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc", -+ "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc" -+] -+ - if not CONFIG["MOZ_DEBUG"]: - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" -@@ -36,194 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -48352,7 +71974,7 @@ index 645c2d7c0273..2fd65278b4df 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -48363,7 +71985,6 @@ index 645c2d7c0273..2fd65278b4df 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -48391,19 +72012,10 @@ index 645c2d7c0273..2fd65278b4df 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc", -- "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -48413,11 +72025,6 @@ index 645c2d7c0273..2fd65278b4df 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc", -- "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc" -- ] -- -if CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True @@ -48445,26 +72052,8 @@ index 645c2d7c0273..2fd65278b4df 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "ole32", -- "oleaut32", -- "secur32", -- "strmiids", -- "user32", - "winmm" - ] -- -- SOURCES += [ -- "/third_party/libwebrtc/modules/video_capture/windows/device_info_ds.cc", -- "/third_party/libwebrtc/modules/video_capture/windows/help_functions_ds.cc", -- "/third_party/libwebrtc/modules/video_capture/windows/sink_filter_ds.cc" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/video_capture/windows/video_capture_ds.cc", -- "/third_party/libwebrtc/modules/video_capture/windows/video_capture_factory_windows.cc" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -48474,9 +72063,31 @@ index 645c2d7c0273..2fd65278b4df 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -48511,6 +72122,10 @@ index 645c2d7c0273..2fd65278b4df 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -48521,42 +72136,43 @@ index 645c2d7c0273..2fd65278b4df 100644 - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("video_capture_internal_impl_gn") -diff --git third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build -index 1322791ebee7..8875e88c3b58 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("rtt_mult_experiment_gn") +diff --git third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build +index c1854a7f4dfb..5ba40788ff5d 100644 +--- third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build ++++ third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -48565,7 +72181,7 @@ index 1322791ebee7..8875e88c3b58 100644 FINAL_LIBRARY = "webrtc" -@@ -44,173 +53,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -48573,7 +72189,7 @@ index 1322791ebee7..8875e88c3b58 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -48584,7 +72200,6 @@ index 1322791ebee7..8875e88c3b58 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -48612,14 +72227,10 @@ index 1322791ebee7..8875e88c3b58 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -48656,9 +72267,6 @@ index 1322791ebee7..8875e88c3b58 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -48677,6 +72285,24 @@ index 1322791ebee7..8875e88c3b58 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -48710,8 +72336,7 @@ index 1322791ebee7..8875e88c3b58 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -48729,34 +72354,40 @@ index 1322791ebee7..8875e88c3b58 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("video_capture_module_gn") -diff --git third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build -index 2f3f10ecfec9..52da1dec4b94 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("stable_target_rate_experiment_gn") +diff --git third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build +index a6650bd66393..393c4a6a5b5f 100644 +--- third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build ++++ third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -48765,7 +72396,7 @@ index 2f3f10ecfec9..52da1dec4b94 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -48773,7 +72404,7 @@ index 2f3f10ecfec9..52da1dec4b94 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -48783,10 +72414,6 @@ index 2f3f10ecfec9..52da1dec4b94 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -48814,6 +72441,7 @@ index 2f3f10ecfec9..52da1dec4b94 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -48848,10 +72476,6 @@ index 2f3f10ecfec9..52da1dec4b94 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -48861,14 +72485,26 @@ index 2f3f10ecfec9..52da1dec4b94 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -48890,9 +72526,10 @@ index 2f3f10ecfec9..52da1dec4b94 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -48902,10 +72539,6 @@ index 2f3f10ecfec9..52da1dec4b94 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -48919,35 +72552,31 @@ index 2f3f10ecfec9..52da1dec4b94 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("chain_diff_calculator_gn") -diff --git third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build -index a509d7ca5d3a..cc82b257a89a 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("gtest_prod_gn") +diff --git third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build +index 88e1ee554758..7f4ca498bb80 100644 +--- third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build ++++ third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -48956,7 +72585,7 @@ index a509d7ca5d3a..cc82b257a89a 100644 FINAL_LIBRARY = "webrtc" -@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -48964,7 +72593,7 @@ index a509d7ca5d3a..cc82b257a89a 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -49005,6 +72634,7 @@ index a509d7ca5d3a..cc82b257a89a 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -49048,9 +72678,31 @@ index a509d7ca5d3a..cc82b257a89a 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -49085,6 +72737,10 @@ index a509d7ca5d3a..cc82b257a89a 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -49098,30 +72754,145 @@ index a509d7ca5d3a..cc82b257a89a 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("codec_globals_headers_gn") -diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_decoder_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_decoder_gn/moz.build -index 7c6bba5360ea..d86571445dc1 100644 ---- third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_decoder_gn/moz.build -+++ third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_decoder_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + 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 01eeabbf70bc..000000000000 +--- third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build ++++ /dev/null +@@ -1,99 +0,0 @@ +-# This Source Code Form is subject to the terms of the Mozilla Public +-# License, v. 2.0. If a copy of the MPL was not distributed with this +-# file, You can obtain one at http://mozilla.org/MPL/2.0/. +- +- +- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### +- ### DO NOT edit it by hand. ### +- +-COMPILE_FLAGS["OS_INCLUDES"] = [] +-AllowCompilerWarnings() +- +-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +-DEFINES["ANDROID"] = True +-DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +-DEFINES["HAVE_SYS_UIO_H"] = True +-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True +-DEFINES["RTC_ENABLE_VP9"] = True +-DEFINES["WEBRTC_ANDROID"] = True +-DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" +-DEFINES["WEBRTC_LIBRARY_IMPL"] = True +-DEFINES["WEBRTC_LINUX"] = True +-DEFINES["WEBRTC_MOZILLA_BUILD"] = True +-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +-DEFINES["WEBRTC_POSIX"] = True +-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +-DEFINES["_GNU_SOURCE"] = True +-DEFINES["__STDC_CONSTANT_MACROS"] = True +-DEFINES["__STDC_FORMAT_MACROS"] = True +- +-FINAL_LIBRARY = "webrtc" +- +- +-LOCAL_INCLUDES += [ +- "!/ipc/ipdl/_ipdlheaders", +- "!/third_party/libwebrtc/gen", +- "/ipc/chromium/src", +- "/third_party/libwebrtc/", +- "/third_party/libwebrtc/third_party/abseil-cpp/", +- "/tools/profiler/public" +-] +- +-OS_LIBS += [ +- "GLESv2", +- "log" +-] +- +-UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/rtc_base/ifaddrs_android.cc" +-] +- +-if not CONFIG["MOZ_DEBUG"]: +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" +- DEFINES["NDEBUG"] = True +- DEFINES["NVALGRIND"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1": +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- DEFINES["_DEBUG"] = True +- +-if CONFIG["CPU_ARCH"] == "aarch64": +- +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86": +- +- CXXFLAGS += [ +- "-msse2" +- ] +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "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 d7b06159cea2..ede6074320d3 100644 +--- third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build ++++ third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -49130,7 +72901,7 @@ index 7c6bba5360ea..d86571445dc1 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -49138,7 +72909,7 @@ index 7c6bba5360ea..d86571445dc1 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -49148,10 +72919,6 @@ index 7c6bba5360ea..d86571445dc1 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -49179,6 +72946,7 @@ index 7c6bba5360ea..d86571445dc1 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -49213,10 +72981,6 @@ index 7c6bba5360ea..d86571445dc1 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -49226,14 +72990,26 @@ index 7c6bba5360ea..d86571445dc1 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -49255,9 +73031,10 @@ index 7c6bba5360ea..d86571445dc1 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -49267,10 +73044,6 @@ index 7c6bba5360ea..d86571445dc1 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -49284,35 +73057,31 @@ index 7c6bba5360ea..d86571445dc1 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("aom_av1_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 ebba8c336f4b..9ef28453d005 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("ignore_wundef_gn") +diff --git third_party/libwebrtc/rtc_base/ip_address_gn/moz.build third_party/libwebrtc/rtc_base/ip_address_gn/moz.build +index a55837b63428..3310e1e14d3c 100644 +--- third_party/libwebrtc/rtc_base/ip_address_gn/moz.build ++++ third_party/libwebrtc/rtc_base/ip_address_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -49321,7 +73090,7 @@ index ebba8c336f4b..9ef28453d005 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -49329,7 +73098,7 @@ index ebba8c336f4b..9ef28453d005 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -49340,6 +73109,7 @@ index ebba8c336f4b..9ef28453d005 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ +- "GLESv2", - "log" - ] - @@ -49370,6 +73140,7 @@ index ebba8c336f4b..9ef28453d005 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -49406,6 +73177,9 @@ index ebba8c336f4b..9ef28453d005 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -49424,6 +73198,24 @@ index ebba8c336f4b..9ef28453d005 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -49458,10 +73250,10 @@ index ebba8c336f4b..9ef28453d005 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -49475,35 +73267,40 @@ index ebba8c336f4b..9ef28453d005 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("aom_av1_encoder_gn") -diff --git third_party/libwebrtc/modules/video_coding/deprecated/nack_module_gn/moz.build third_party/libwebrtc/modules/video_coding/deprecated/nack_module_gn/moz.build -index 8ffb99dc9f9b..9fbd352cdf2a 100644 ---- third_party/libwebrtc/modules/video_coding/deprecated/nack_module_gn/moz.build -+++ third_party/libwebrtc/modules/video_coding/deprecated/nack_module_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + 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 a1b3462893f1..7363168e0153 100644 +--- third_party/libwebrtc/rtc_base/logging_gn/moz.build ++++ third_party/libwebrtc/rtc_base/logging_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -49512,7 +73309,7 @@ index 8ffb99dc9f9b..9fbd352cdf2a 100644 FINAL_LIBRARY = "webrtc" -@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -49520,7 +73317,7 @@ index 8ffb99dc9f9b..9fbd352cdf2a 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -49558,13 +73355,10 @@ index 8ffb99dc9f9b..9fbd352cdf2a 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -49601,9 +73395,6 @@ index 8ffb99dc9f9b..9fbd352cdf2a 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -49622,6 +73413,24 @@ index 8ffb99dc9f9b..9fbd352cdf2a 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -49655,8 +73464,7 @@ index 8ffb99dc9f9b..9fbd352cdf2a 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -49674,34 +73482,40 @@ index 8ffb99dc9f9b..9fbd352cdf2a 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("nack_module_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 ec4c04daed07..aed6cdae0672 100644 ---- third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build -+++ third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("logging_gn") +diff --git third_party/libwebrtc/rtc_base/macromagic_gn/moz.build third_party/libwebrtc/rtc_base/macromagic_gn/moz.build +index 372b4d28f8a7..3a1e46270270 100644 +--- third_party/libwebrtc/rtc_base/macromagic_gn/moz.build ++++ third_party/libwebrtc/rtc_base/macromagic_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -49710,7 +73524,7 @@ index ec4c04daed07..aed6cdae0672 100644 FINAL_LIBRARY = "webrtc" -@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -49718,7 +73532,7 @@ index ec4c04daed07..aed6cdae0672 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -49728,11 +73542,6 @@ index ec4c04daed07..aed6cdae0672 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "GLESv2", -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -49757,14 +73566,10 @@ index ec4c04daed07..aed6cdae0672 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -49799,13 +73604,6 @@ index ec4c04daed07..aed6cdae0672 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -49815,14 +73613,26 @@ index ec4c04daed07..aed6cdae0672 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -49844,9 +73654,10 @@ index ec4c04daed07..aed6cdae0672 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -49855,12 +73666,7 @@ index ec4c04daed07..aed6cdae0672 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -49875,33 +73681,30 @@ index ec4c04daed07..aed6cdae0672 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("encoded_frame_gn") -diff --git third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build -index 85bfa4e12eed..264c3baa35aa 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("macromagic_gn") +diff --git third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build +index 139009098bab..eb01e8eadc57 100644 +--- third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build ++++ third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -49910,7 +73713,7 @@ index 85bfa4e12eed..264c3baa35aa 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -49918,7 +73721,7 @@ index 85bfa4e12eed..264c3baa35aa 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -49959,6 +73762,7 @@ index 85bfa4e12eed..264c3baa35aa 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -49993,10 +73797,6 @@ index 85bfa4e12eed..264c3baa35aa 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -50013,6 +73813,24 @@ index 85bfa4e12eed..264c3baa35aa 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -50047,10 +73865,10 @@ index 85bfa4e12eed..264c3baa35aa 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -50064,35 +73882,40 @@ index 85bfa4e12eed..264c3baa35aa 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("frame_dependencies_calculator_gn") -diff --git third_party/libwebrtc/modules/video_coding/nack_module_gn/moz.build third_party/libwebrtc/modules/video_coding/nack_module_gn/moz.build -index 9aaf3524fe58..d43e051ee6ca 100644 ---- third_party/libwebrtc/modules/video_coding/nack_module_gn/moz.build -+++ third_party/libwebrtc/modules/video_coding/nack_module_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("aligned_malloc_gn") +diff --git third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build +index afe42b847585..ac5348af377a 100644 +--- third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build ++++ third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -50101,7 +73924,7 @@ index 9aaf3524fe58..d43e051ee6ca 100644 FINAL_LIBRARY = "webrtc" -@@ -41,171 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -50109,7 +73932,7 @@ index 9aaf3524fe58..d43e051ee6ca 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -50147,13 +73970,10 @@ index 9aaf3524fe58..d43e051ee6ca 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -50188,13 +74008,6 @@ index 9aaf3524fe58..d43e051ee6ca 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -50204,14 +74017,26 @@ index 9aaf3524fe58..d43e051ee6ca 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -50233,9 +74058,10 @@ index 9aaf3524fe58..d43e051ee6ca 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -50244,12 +74070,7 @@ index 9aaf3524fe58..d43e051ee6ca 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -50264,33 +74085,30 @@ index 9aaf3524fe58..d43e051ee6ca 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("nack_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 20e0b2301bc9..b5a9b94a0a1c 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("mod_ops_gn") +diff --git third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build +index fdbf859c3749..d20ce225c3f9 100644 +--- third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build ++++ third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -50299,7 +74117,7 @@ index 20e0b2301bc9..b5a9b94a0a1c 100644 FINAL_LIBRARY = "webrtc" -@@ -41,173 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -50307,7 +74125,7 @@ index 20e0b2301bc9..b5a9b94a0a1c 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -50318,7 +74136,6 @@ index 20e0b2301bc9..b5a9b94a0a1c 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -50346,14 +74163,10 @@ index 20e0b2301bc9..b5a9b94a0a1c 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -50388,13 +74201,6 @@ index 20e0b2301bc9..b5a9b94a0a1c 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -50404,14 +74210,26 @@ index 20e0b2301bc9..b5a9b94a0a1c 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -50433,9 +74251,10 @@ index 20e0b2301bc9..b5a9b94a0a1c 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -50444,12 +74263,7 @@ index 20e0b2301bc9..b5a9b94a0a1c 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -50464,33 +74278,30 @@ index 20e0b2301bc9..b5a9b94a0a1c 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("video_codec_interface_gn") -diff --git third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build -index 5d1d6b149efe..dbc070a0591d 100644 ---- third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build -+++ third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("moving_max_counter_gn") +diff --git third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build +index 4ac9a06df874..7f32da55511f 100644 +--- third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build ++++ third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -50499,7 +74310,7 @@ index 5d1d6b149efe..dbc070a0591d 100644 FINAL_LIBRARY = "webrtc" -@@ -60,173 +69,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -50507,7 +74318,7 @@ index 5d1d6b149efe..dbc070a0591d 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -50546,14 +74357,10 @@ index 5d1d6b149efe..dbc070a0591d 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -50611,6 +74418,24 @@ index 5d1d6b149efe..dbc070a0591d 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -50644,8 +74469,7 @@ index 5d1d6b149efe..dbc070a0591d 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -50663,34 +74487,40 @@ index 5d1d6b149efe..dbc070a0591d 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("video_coding_gn") -diff --git third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build -index aef956f70da7..3cfd326a858f 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("net_helpers_gn") +diff --git third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build +index cdcbaee77937..ea4f2aacc117 100644 +--- third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build ++++ third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -50699,7 +74529,7 @@ index aef956f70da7..3cfd326a858f 100644 FINAL_LIBRARY = "webrtc" -@@ -49,173 +58,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -50707,7 +74537,7 @@ index aef956f70da7..3cfd326a858f 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -50717,11 +74547,6 @@ index aef956f70da7..3cfd326a858f 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "GLESv2", -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -50746,14 +74571,10 @@ index aef956f70da7..3cfd326a858f 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -50788,13 +74609,6 @@ index aef956f70da7..3cfd326a858f 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -50811,6 +74625,24 @@ index aef956f70da7..3cfd326a858f 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -50844,8 +74676,7 @@ index aef956f70da7..3cfd326a858f 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -50863,34 +74694,40 @@ index aef956f70da7..3cfd326a858f 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("video_coding_utility_gn") -diff --git third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build -index 3eab3acb7156..23efd0636d75 100644 ---- third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build -+++ third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("sent_packet_gn") +diff --git third_party/libwebrtc/rtc_base/network_constants_gn/moz.build third_party/libwebrtc/rtc_base/network_constants_gn/moz.build +index 9b7fb4a6703e..c5b7fcd69e98 100644 +--- third_party/libwebrtc/rtc_base/network_constants_gn/moz.build ++++ third_party/libwebrtc/rtc_base/network_constants_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -50899,7 +74736,7 @@ index 3eab3acb7156..23efd0636d75 100644 FINAL_LIBRARY = "webrtc" -@@ -45,173 +54,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -50907,7 +74744,7 @@ index 3eab3acb7156..23efd0636d75 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -50918,7 +74755,6 @@ index 3eab3acb7156..23efd0636d75 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -50946,14 +74782,10 @@ index 3eab3acb7156..23efd0636d75 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -50988,13 +74820,6 @@ index 3eab3acb7156..23efd0636d75 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -51011,6 +74836,24 @@ index 3eab3acb7156..23efd0636d75 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -51044,8 +74887,7 @@ index 3eab3acb7156..23efd0636d75 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -51063,34 +74905,40 @@ index 3eab3acb7156..23efd0636d75 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("webrtc_h264_gn") -diff --git third_party/libwebrtc/modules/video_coding/webrtc_multiplex_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_multiplex_gn/moz.build -index 087fbfe8054e..7b93387c4dff 100644 ---- third_party/libwebrtc/modules/video_coding/webrtc_multiplex_gn/moz.build -+++ third_party/libwebrtc/modules/video_coding/webrtc_multiplex_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("network_constants_gn") +diff --git third_party/libwebrtc/rtc_base/network_route_gn/moz.build third_party/libwebrtc/rtc_base/network_route_gn/moz.build +index 7b0f634578f3..1ec2058feb83 100644 +--- third_party/libwebrtc/rtc_base/network_route_gn/moz.build ++++ third_party/libwebrtc/rtc_base/network_route_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -51099,7 +74947,7 @@ index 087fbfe8054e..7b93387c4dff 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +52,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -51107,7 +74955,7 @@ index 087fbfe8054e..7b93387c4dff 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -51118,7 +74966,6 @@ index 087fbfe8054e..7b93387c4dff 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -51146,14 +74993,10 @@ index 087fbfe8054e..7b93387c4dff 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -51188,13 +75031,6 @@ index 087fbfe8054e..7b93387c4dff 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -51211,6 +75047,24 @@ index 087fbfe8054e..7b93387c4dff 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -51244,8 +75098,7 @@ index 087fbfe8054e..7b93387c4dff 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -51263,34 +75116,40 @@ index 087fbfe8054e..7b93387c4dff 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("webrtc_multiplex_gn") -diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build -index 66a15bc24254..2debf9425e57 100644 ---- third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build -+++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("network_route_gn") +diff --git third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build +index f77bcf8aa788..df6cf74c5b16 100644 +--- third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build ++++ third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -51299,7 +75158,7 @@ index 66a15bc24254..2debf9425e57 100644 FINAL_LIBRARY = "webrtc" -@@ -44,173 +53,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -51307,7 +75166,7 @@ index 66a15bc24254..2debf9425e57 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -51346,14 +75205,10 @@ index 66a15bc24254..2debf9425e57 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -51411,6 +75266,24 @@ index 66a15bc24254..2debf9425e57 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -51444,8 +75317,7 @@ index 66a15bc24254..2debf9425e57 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -51463,34 +75335,40 @@ index 66a15bc24254..2debf9425e57 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("webrtc_vp8_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 e0af1f81e72b..6a4e2e3ada91 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("null_socket_server_gn") +diff --git third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build +index ac24f995c6c1..a8d26b774863 100644 +--- third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build ++++ third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -51499,7 +75377,7 @@ index e0af1f81e72b..6a4e2e3ada91 100644 FINAL_LIBRARY = "webrtc" -@@ -45,173 +54,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -51507,7 +75385,7 @@ index e0af1f81e72b..6a4e2e3ada91 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -51518,7 +75396,6 @@ index e0af1f81e72b..6a4e2e3ada91 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -51546,14 +75423,10 @@ index e0af1f81e72b..6a4e2e3ada91 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -51588,13 +75461,6 @@ index e0af1f81e72b..6a4e2e3ada91 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -51604,14 +75470,26 @@ index e0af1f81e72b..6a4e2e3ada91 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -51633,9 +75511,10 @@ index e0af1f81e72b..6a4e2e3ada91 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -51644,12 +75523,7 @@ index e0af1f81e72b..6a4e2e3ada91 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -51664,33 +75538,30 @@ index e0af1f81e72b..6a4e2e3ada91 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("webrtc_vp8_temporal_layers_gn") -diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build -index 9aa5e0557fbe..a5d0fc436195 100644 ---- third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build -+++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("one_time_event_gn") +diff --git third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build +index c580f7e67a0a..3fea9a2d6b27 100644 +--- third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build ++++ third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -51699,7 +75570,7 @@ index 9aa5e0557fbe..a5d0fc436195 100644 FINAL_LIBRARY = "webrtc" -@@ -42,173 +51,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -51707,7 +75578,7 @@ index 9aa5e0557fbe..a5d0fc436195 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -51718,7 +75589,6 @@ index 9aa5e0557fbe..a5d0fc436195 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -51746,14 +75616,10 @@ index 9aa5e0557fbe..a5d0fc436195 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -51790,9 +75656,6 @@ index 9aa5e0557fbe..a5d0fc436195 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -51811,6 +75674,24 @@ index 9aa5e0557fbe..a5d0fc436195 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -51844,8 +75725,7 @@ index 9aa5e0557fbe..a5d0fc436195 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -51863,34 +75743,40 @@ index 9aa5e0557fbe..a5d0fc436195 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = 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 7f52a73077f0..0083baaf9559 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("platform_thread_gn") +diff --git third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build +index 713a9cc2fdf7..99ec083c6586 100644 +--- third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build ++++ third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -51899,7 +75785,7 @@ index 7f52a73077f0..0083baaf9559 100644 FINAL_LIBRARY = "webrtc" -@@ -41,173 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -51907,7 +75793,7 @@ index 7f52a73077f0..0083baaf9559 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -51918,7 +75804,6 @@ index 7f52a73077f0..0083baaf9559 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -51946,14 +75831,10 @@ index 7f52a73077f0..0083baaf9559 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -51988,13 +75869,6 @@ index 7f52a73077f0..0083baaf9559 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -52011,6 +75885,24 @@ index 7f52a73077f0..0083baaf9559 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -52044,8 +75936,7 @@ index 7f52a73077f0..0083baaf9559 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -52063,34 +75954,40 @@ index 7f52a73077f0..0083baaf9559 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("webrtc_vp9_helpers_gn") -diff --git third_party/libwebrtc/modules/video_processing/denoiser_filter_gn/moz.build third_party/libwebrtc/modules/video_processing/denoiser_filter_gn/moz.build -index bd1b5a54b70a..daa6a926e78e 100644 ---- third_party/libwebrtc/modules/video_processing/denoiser_filter_gn/moz.build -+++ third_party/libwebrtc/modules/video_processing/denoiser_filter_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("platform_thread_types_gn") +diff --git third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build +index a5a3d7492137..d9d75b3b91be 100644 +--- third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build ++++ third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -52099,7 +75996,7 @@ index bd1b5a54b70a..daa6a926e78e 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -52107,7 +76004,7 @@ index bd1b5a54b70a..daa6a926e78e 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -52144,6 +76041,7 @@ index bd1b5a54b70a..daa6a926e78e 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -52191,6 +76089,22 @@ index bd1b5a54b70a..daa6a926e78e 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -52212,9 +76126,10 @@ index bd1b5a54b70a..daa6a926e78e 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -52244,23 +76159,24 @@ index bd1b5a54b70a..daa6a926e78e 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("denoiser_filter_gn") -diff --git third_party/libwebrtc/modules/video_processing/video_processing_gn/moz.build third_party/libwebrtc/modules/video_processing/video_processing_gn/moz.build -index 439ca091a399..0cd8182ca1ed 100644 ---- third_party/libwebrtc/modules/video_processing/video_processing_gn/moz.build -+++ third_party/libwebrtc/modules/video_processing/video_processing_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("protobuf_utils_gn") +diff --git third_party/libwebrtc/rtc_base/race_checker_gn/moz.build third_party/libwebrtc/rtc_base/race_checker_gn/moz.build +index 514f8957fee9..e3529cc2a54b 100644 +--- third_party/libwebrtc/rtc_base/race_checker_gn/moz.build ++++ third_party/libwebrtc/rtc_base/race_checker_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -52269,7 +76185,7 @@ index 439ca091a399..0cd8182ca1ed 100644 FINAL_LIBRARY = "webrtc" -@@ -46,173 +55,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -52277,7 +76193,7 @@ index 439ca091a399..0cd8182ca1ed 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -52288,7 +76204,6 @@ index 439ca091a399..0cd8182ca1ed 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -52316,14 +76231,10 @@ index 439ca091a399..0cd8182ca1ed 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -52358,13 +76269,6 @@ index 439ca091a399..0cd8182ca1ed 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -52381,6 +76285,24 @@ index 439ca091a399..0cd8182ca1ed 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -52414,8 +76336,7 @@ index 439ca091a399..0cd8182ca1ed 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -52433,36 +76354,40 @@ index 439ca091a399..0cd8182ca1ed 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("video_processing_gn") -diff --git third_party/libwebrtc/modules/video_processing/video_processing_neon_gn/moz.build third_party/libwebrtc/modules/video_processing/video_processing_neon_gn/moz.build -index 873dd23bd8e8..48061d6115fa 100644 ---- third_party/libwebrtc/modules/video_processing/video_processing_neon_gn/moz.build -+++ third_party/libwebrtc/modules/video_processing/video_processing_neon_gn/moz.build -@@ -11,11 +11,21 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("race_checker_gn") +diff --git third_party/libwebrtc/rtc_base/random_gn/moz.build third_party/libwebrtc/rtc_base/random_gn/moz.build +index 9b3592566474..9c8984a140d6 100644 +--- third_party/libwebrtc/rtc_base/random_gn/moz.build ++++ third_party/libwebrtc/rtc_base/random_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" -+DEFINES["WEBRTC_ARCH_ARM64"] = True ++DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" - DEFINES["WEBRTC_HAS_NEON"] = True DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +DEFINES["WEBRTC_POSIX"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True @@ -52471,7 +76396,7 @@ index 873dd23bd8e8..48061d6115fa 100644 FINAL_LIBRARY = "webrtc" -@@ -41,132 +51,6 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -52479,7 +76404,7 @@ index 873dd23bd8e8..48061d6115fa 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -52489,9 +76414,12 @@ index 873dd23bd8e8..48061d6115fa 100644 - 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -52509,7 +76437,6 @@ index 873dd23bd8e8..48061d6115fa 100644 - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_GNU_SOURCE"] = True - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True @@ -52518,8 +76445,8 @@ index 873dd23bd8e8..48061d6115fa 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" @@ -52536,7 +76463,6 @@ index 873dd23bd8e8..48061d6115fa 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -52554,7 +76480,13 @@ index 873dd23bd8e8..48061d6115fa 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + -if CONFIG["CPU_ARCH"] == "arm": - - CXXFLAGS += [ @@ -52563,6 +76495,25 @@ index 873dd23bd8e8..48061d6115fa 100644 - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -52570,8 +76521,8 @@ index 873dd23bd8e8..48061d6115fa 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_DEBUG"] = True - +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -52588,10 +76539,6 @@ index 873dd23bd8e8..48061d6115fa 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["WEBRTC_ARCH_ARM64"] = True -- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -52599,27 +76546,59 @@ index 873dd23bd8e8..48061d6115fa 100644 - "unwind" - ] - +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- + CXXFLAGS += [ + "-msse2" + ] + +- OS_LIBS += [ +- "android_support" +- ] +- -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - - Library("video_processing_neon_gn") -diff --git third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn/moz.build third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn/moz.build -index be3f4a1ae6c5..578fd2141719 100644 ---- third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn/moz.build -+++ third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + Library("random_gn") +diff --git third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build +index 969a79b712df..51b27be6a666 100644 +--- third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build ++++ third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -52628,7 +76607,7 @@ index be3f4a1ae6c5..578fd2141719 100644 FINAL_LIBRARY = "webrtc" -@@ -40,155 +49,16 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -52636,7 +76615,7 @@ index be3f4a1ae6c5..578fd2141719 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -52652,10 +76631,6 @@ index be3f4a1ae6c5..578fd2141719 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -52673,7 +76648,6 @@ index be3f4a1ae6c5..578fd2141719 100644 - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_GNU_SOURCE"] = True - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True @@ -52685,11 +76659,8 @@ index be3f4a1ae6c5..578fd2141719 100644 - -if CONFIG["OS_TARGET"] == "OpenBSD": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -52731,6 +76702,40 @@ index be3f4a1ae6c5..578fd2141719 100644 - "secur32", - "winmm" - ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -52746,8 +76751,8 @@ index be3f4a1ae6c5..578fd2141719 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True - +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" @@ -52756,320 +76761,66 @@ index be3f4a1ae6c5..578fd2141719 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -- -- CXXFLAGS += [ -- "-msse2", -- "-msse2" -- ] +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -- "android_support" +- "android_support", +- "unwind" - ] - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android": -- -- CXXFLAGS += [ -- "-msse2" -- ] +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - CXXFLAGS += [ - "-msse2", "-msse2" ] --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86_64": - - CXXFLAGS += [ - "-msse2" -diff --git third_party/libwebrtc/moz.build third_party/libwebrtc/moz.build -index 8579f8bb3622..b01f3fe7092d 100644 ---- third_party/libwebrtc/moz.build -+++ third_party/libwebrtc/moz.build -@@ -25,7 +25,9 @@ DIRS += [ - "/third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn", - "/third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn", - "/third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn", -+ "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn", - "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn", -+ "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn", - "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_gn", - "/third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn", - "/third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn", -@@ -157,7 +159,9 @@ DIRS += [ - "/third_party/libwebrtc/modules/audio_coding/ilbc_c_gn", - "/third_party/libwebrtc/modules/audio_coding/ilbc_gn", - "/third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn", -+ "/third_party/libwebrtc/modules/audio_coding/isac_c_gn", - "/third_party/libwebrtc/modules/audio_coding/isac_common_gn", -+ "/third_party/libwebrtc/modules/audio_coding/isac_gn", - "/third_party/libwebrtc/modules/audio_coding/isac_vad_gn", - "/third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn", - "/third_party/libwebrtc/modules/audio_coding/neteq_gn", -@@ -233,6 +237,9 @@ DIRS += [ - "/third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn", - "/third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn", - "/third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn", -+ "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn", -+ "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", -+ "/third_party/libwebrtc/modules/desktop_capture/primitives_gn", - "/third_party/libwebrtc/modules/module_api_gn", - "/third_party/libwebrtc/modules/module_api_public_gn", - "/third_party/libwebrtc/modules/module_fec_api_gn", -@@ -368,214 +375,7 @@ DIRS += [ - "/third_party/libwebrtc/webrtc_gn" - ] - --if CONFIG["OS_TARGET"] == "Darwin": -- -- DIRS += [ -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn", -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_c_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_gn", -- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn", -- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", -- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn", -- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn", -- "/third_party/libwebrtc/rtc_base/system/cocoa_threading_gn", -- "/third_party/libwebrtc/sdk/base_objc_gn", -- "/third_party/libwebrtc/sdk/helpers_objc_gn" -- ] -- --if CONFIG["OS_TARGET"] == "OpenBSD": -- -- DIRS += [ -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn", -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_c_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_gn", -- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn", -- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", -- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn" -- ] -- --if CONFIG["OS_TARGET"] == "WINNT": -- -- DIRS += [ -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn", -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_c_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_gn", -- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn", -- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", -- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn" -- ] -- --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android": -- -- DIRS += [ -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn", -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn", -- "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", -- "/third_party/libwebrtc/common_audio/common_audio_neon_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_c_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_gn", -- "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn" -- ] -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -- -- DIRS += [ -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix_gn", -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix_gn", -- "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", -- "/third_party/libwebrtc/common_audio/common_audio_neon_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_fix_c_arm_asm_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_fix_c_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_fix_common_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_fix_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_neon_gn", -- "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn", -- "/third_party/libwebrtc/rtc_base/system/asm_defines_gn" -- ] -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -- -- DIRS += [ -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn", -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn", -- "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", -- "/third_party/libwebrtc/common_audio/common_audio_sse2_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_c_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_gn", -- "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn", -- "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn" -- ] -- --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android": -- -- DIRS += [ -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn", -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn", -- "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", -- "/third_party/libwebrtc/common_audio/common_audio_sse2_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_c_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_gn", -- "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn", -- "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn" -- ] -- --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Darwin": -- -- DIRS += [ -- "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", -- "/third_party/libwebrtc/common_audio/common_audio_neon_gn", -- "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn" -- ] -- --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Darwin": -- -- DIRS += [ -- "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", -- "/third_party/libwebrtc/common_audio/common_audio_sse2_gn", -- "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn", -- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn", -- "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn" +- OS_LIBS += [ +- "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DIRS += [ -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn", -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn", -- "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", -- "/third_party/libwebrtc/common_audio/common_audio_neon_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_c_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_gn", -- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn", -- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", -- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn", -- "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn" -- ] +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DIRS += [ -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix_gn", -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix_gn", -- "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", -- "/third_party/libwebrtc/common_audio/common_audio_neon_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_fix_c_arm_asm_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_fix_c_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_fix_common_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_fix_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_neon_gn", -- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn", -- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", -- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn", -- "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn", -- "/third_party/libwebrtc/rtc_base/system/asm_defines_gn" -- ] -- --if CONFIG["CPU_ARCH"] == "ppc64" and CONFIG["OS_TARGET"] == "Linux": -- -- DIRS += [ -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn", -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_c_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_gn" -- ] +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- -- DIRS += [ -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn", -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn", -- "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", -- "/third_party/libwebrtc/common_audio/common_audio_sse2_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_c_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_gn", -- "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn", -- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn", -- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn", -- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", -- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn", -- "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn" -- ] -- --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DIRS += [ -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn", -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn", -- "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", -- "/third_party/libwebrtc/common_audio/common_audio_sse2_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_c_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_gn", -- "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn", -- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn", -- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn", -- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", -- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn", -- "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn" -- ] -- --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "OpenBSD": -- -- DIRS += [ -- "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", -- "/third_party/libwebrtc/common_audio/common_audio_neon_gn", -- "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn" -- ] -- --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "OpenBSD": -- -- DIRS += [ -- "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", -- "/third_party/libwebrtc/common_audio/common_audio_sse2_gn", -- "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn", -- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn", -- "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn" -- ] -- --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "WINNT": -+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - DIRS += [ - "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", -@@ -583,7 +383,7 @@ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "WINNT": - "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn" - ] - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "WINNT": -+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD": +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DIRS += [ - "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", -@@ -593,7 +393,7 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "WINNT": - "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn" - ] +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "WINNT": -+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "FreeBSD": +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - DIRS += [ - "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", -diff --git third_party/libwebrtc/rtc_base/atomicops_gn/moz.build third_party/libwebrtc/rtc_base/atomicops_gn/moz.build -index 963c9d8d4e47..72a045e0479f 100644 ---- third_party/libwebrtc/rtc_base/atomicops_gn/moz.build -+++ third_party/libwebrtc/rtc_base/atomicops_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + Library("rate_limiter_gn") +diff --git third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build +index b40a4fdda662..ec6d4550feef 100644 +--- third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build ++++ third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -53078,7 +76829,7 @@ index 963c9d8d4e47..72a045e0479f 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -53086,7 +76837,7 @@ index 963c9d8d4e47..72a045e0479f 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -53096,6 +76847,10 @@ index 963c9d8d4e47..72a045e0479f 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -53123,6 +76878,7 @@ index 963c9d8d4e47..72a045e0479f 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -53157,6 +76913,10 @@ index 963c9d8d4e47..72a045e0479f 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -53166,9 +76926,31 @@ index 963c9d8d4e47..72a045e0479f 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -53203,6 +76985,10 @@ index 963c9d8d4e47..72a045e0479f 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -53216,30 +77002,40 @@ index 963c9d8d4e47..72a045e0479f 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("atomicops_gn") -diff --git third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build -index 741fb67c65ed..6b0f4f96b926 100644 ---- third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build -+++ third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 26f81f4f5ed3..a7abd9b6b0e7 100644 +--- third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build ++++ third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -53248,7 +77044,7 @@ index 741fb67c65ed..6b0f4f96b926 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -53256,7 +77052,7 @@ index 741fb67c65ed..6b0f4f96b926 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -53297,6 +77093,7 @@ index 741fb67c65ed..6b0f4f96b926 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -53352,192 +77149,23 @@ index 741fb67c65ed..6b0f4f96b926 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" -- --if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -- -- CXXFLAGS += [ -- "-msse2" -- ] -- -- OS_LIBS += [ -- "android_support" -- ] -- --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] + if CONFIG["CPU_ARCH"] == "mips32": + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["CPU_ARCH"] == "mips64": - - DEFINES["_GNU_SOURCE"] = True -- - Library("audio_format_to_string_gn") -diff --git third_party/libwebrtc/rtc_base/checks_gn/moz.build third_party/libwebrtc/rtc_base/checks_gn/moz.build -index 985ffb8c0c5b..93a7f5c82853 100644 ---- third_party/libwebrtc/rtc_base/checks_gn/moz.build -+++ third_party/libwebrtc/rtc_base/checks_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True -+DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["_FILE_OFFSET_BITS"] = "64" -+DEFINES["_LARGEFILE64_SOURCE"] = True -+DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True - - FINAL_LIBRARY = "webrtc" - -@@ -40,160 +49,17 @@ 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"] = "r20_1" -- DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- -- OS_LIBS += [ -- "log" -- ] -- --if CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True -- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_AURA"] = "1" -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_NSS_CERTS"] = "1" -- DEFINES["USE_OZONE"] = "1" -- DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True -- DEFINES["NOMINMAX"] = True -- DEFINES["NTDDI_VERSION"] = "0x0A000000" -- DEFINES["PSAPI_VERSION"] = "2" -- DEFINES["UNICODE"] = True -- DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True -- DEFINES["WIN32"] = True -- DEFINES["WIN32_LEAN_AND_MEAN"] = True -- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" -- DEFINES["WINVER"] = "0x0A00" -- DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_RAND_S"] = True -- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True -- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True -- DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True -- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True -- DEFINES["_SECURE_ATL"] = True -- DEFINES["_UNICODE"] = True -- DEFINES["_WIN32_WINNT"] = "0x0A00" -- DEFINES["_WINDOWS"] = True -- DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True + if CONFIG["CPU_ARCH"] == "x86": --if CONFIG["CPU_ARCH"] == "arm": +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] +-if CONFIG["CPU_ARCH"] == "x86_64": - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -53571,8 +77199,7 @@ index 985ffb8c0c5b..93a7f5c82853 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -53590,34 +77217,40 @@ index 985ffb8c0c5b..93a7f5c82853 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("checks_gn") -diff --git third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build -index 95c3d974b436..4d4ec0a86468 100644 ---- third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build -+++ third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 f8c49daa900e..091d88e0545b 100644 +--- third_party/libwebrtc/rtc_base/refcount_gn/moz.build ++++ third_party/libwebrtc/rtc_base/refcount_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -53626,7 +77259,7 @@ index 95c3d974b436..4d4ec0a86468 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -53634,7 +77267,7 @@ index 95c3d974b436..4d4ec0a86468 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -53671,6 +77304,7 @@ index 95c3d974b436..4d4ec0a86468 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -53718,6 +77352,22 @@ index 95c3d974b436..4d4ec0a86468 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -53739,9 +77389,10 @@ index 95c3d974b436..4d4ec0a86468 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -53771,23 +77422,24 @@ index 95c3d974b436..4d4ec0a86468 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("compile_assert_c_gn") -diff --git third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build -index 7a36bfe59368..e0664d70169b 100644 ---- third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build -+++ third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("refcount_gn") +diff --git third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build +index eef6c6bc5d45..f04b9eb51ce7 100644 +--- third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build ++++ third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -53796,7 +77448,7 @@ index 7a36bfe59368..e0664d70169b 100644 FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -53804,7 +77456,7 @@ index 7a36bfe59368..e0664d70169b 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -53845,6 +77497,7 @@ index 7a36bfe59368..e0664d70169b 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -53888,14 +77541,26 @@ index 7a36bfe59368..e0664d70169b 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -53917,9 +77582,10 @@ index 7a36bfe59368..e0664d70169b 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -53928,12 +77594,7 @@ index 7a36bfe59368..e0664d70169b 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -53948,33 +77609,30 @@ index 7a36bfe59368..e0664d70169b 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("criticalsection_gn") -diff --git third_party/libwebrtc/rtc_base/deprecation_gn/moz.build third_party/libwebrtc/rtc_base/deprecation_gn/moz.build -index 984702b66441..6651a3d4fe6a 100644 ---- third_party/libwebrtc/rtc_base/deprecation_gn/moz.build -+++ third_party/libwebrtc/rtc_base/deprecation_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("rolling_accumulator_gn") +diff --git third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build +index db71c35a1add..d03fb3f4e7c8 100644 +--- third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build ++++ third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -53983,7 +77641,7 @@ index 984702b66441..6651a3d4fe6a 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -53991,7 +77649,7 @@ index 984702b66441..6651a3d4fe6a 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -54001,6 +77659,10 @@ index 984702b66441..6651a3d4fe6a 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -54028,6 +77690,7 @@ index 984702b66441..6651a3d4fe6a 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -54062,6 +77725,10 @@ index 984702b66441..6651a3d4fe6a 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -54071,9 +77738,31 @@ index 984702b66441..6651a3d4fe6a 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -54108,6 +77797,10 @@ index 984702b66441..6651a3d4fe6a 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -54121,30 +77814,40 @@ index 984702b66441..6651a3d4fe6a 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("deprecation_gn") -diff --git third_party/libwebrtc/rtc_base/divide_round_gn/moz.build third_party/libwebrtc/rtc_base/divide_round_gn/moz.build -index 799abf416696..979be5da8cfa 100644 ---- third_party/libwebrtc/rtc_base/divide_round_gn/moz.build -+++ third_party/libwebrtc/rtc_base/divide_round_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 65d2c5bb2a2b..1b6e8cb951db 100644 +--- third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build ++++ third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -54153,7 +77856,7 @@ index 799abf416696..979be5da8cfa 100644 FINAL_LIBRARY = "webrtc" -@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,179 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -54161,7 +77864,7 @@ index 799abf416696..979be5da8cfa 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -54202,6 +77905,7 @@ index 799abf416696..979be5da8cfa 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -54245,9 +77949,31 @@ index 799abf416696..979be5da8cfa 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -54282,6 +78008,10 @@ index 799abf416696..979be5da8cfa 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -54295,30 +78025,40 @@ index 799abf416696..979be5da8cfa 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("divide_round_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 19fe6abc20ad..1a6b44ab8eba 100644 ---- third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build -+++ third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("rtc_numerics_gn") +diff --git third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build +index ae0702954d53..8e76dcf845cb 100644 +--- third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build ++++ third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -54327,7 +78067,7 @@ index 19fe6abc20ad..1a6b44ab8eba 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -54335,7 +78075,7 @@ index 19fe6abc20ad..1a6b44ab8eba 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -54376,6 +78116,7 @@ index 19fe6abc20ad..1a6b44ab8eba 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -54410,10 +78151,6 @@ index 19fe6abc20ad..1a6b44ab8eba 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -54430,6 +78167,24 @@ index 19fe6abc20ad..1a6b44ab8eba 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -54464,10 +78219,10 @@ index 19fe6abc20ad..1a6b44ab8eba 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -54481,35 +78236,40 @@ index 19fe6abc20ad..1a6b44ab8eba 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("alr_experiment_gn") -diff --git third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build -index bbdb5131257c..3a8f078f6b1b 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("rtc_task_queue_gn") +diff --git third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build +index 706eb51c9788..5dba9b3a8401 100644 +--- third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build ++++ third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -54518,7 +78278,7 @@ index bbdb5131257c..3a8f078f6b1b 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -54526,7 +78286,7 @@ index bbdb5131257c..3a8f078f6b1b 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -54536,10 +78296,6 @@ index bbdb5131257c..3a8f078f6b1b 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -54567,6 +78323,7 @@ index bbdb5131257c..3a8f078f6b1b 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -54601,10 +78358,6 @@ index bbdb5131257c..3a8f078f6b1b 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -54614,14 +78367,26 @@ index bbdb5131257c..3a8f078f6b1b 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -54643,9 +78408,10 @@ index bbdb5131257c..3a8f078f6b1b 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -54655,10 +78421,6 @@ index bbdb5131257c..3a8f078f6b1b 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -54672,35 +78434,31 @@ index bbdb5131257c..3a8f078f6b1b 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("balanced_degradation_settings_gn") -diff --git third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build -index 0eed1ad60f0d..5473da4ee117 100644 ---- third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build -+++ third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("safe_compare_gn") +diff --git third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build +index 545467bc2319..bc31d2ede82f 100644 +--- third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build ++++ third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -54709,7 +78467,7 @@ index 0eed1ad60f0d..5473da4ee117 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -54717,7 +78475,7 @@ index 0eed1ad60f0d..5473da4ee117 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -54758,6 +78516,7 @@ index 0eed1ad60f0d..5473da4ee117 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -54792,10 +78551,6 @@ index 0eed1ad60f0d..5473da4ee117 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -54805,14 +78560,26 @@ index 0eed1ad60f0d..5473da4ee117 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -54834,9 +78601,10 @@ index 0eed1ad60f0d..5473da4ee117 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -54846,10 +78614,6 @@ index 0eed1ad60f0d..5473da4ee117 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -54863,35 +78627,31 @@ index 0eed1ad60f0d..5473da4ee117 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("cpu_speed_experiment_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 796860694d34..9828487f6eac 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("safe_conversions_gn") +diff --git third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build +index 51c1b7bacdf8..fb72b6128335 100644 +--- third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build ++++ third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -54900,7 +78660,7 @@ index 796860694d34..9828487f6eac 100644 FINAL_LIBRARY = "webrtc" -@@ -43,164 +52,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -54908,7 +78668,7 @@ index 796860694d34..9828487f6eac 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -54949,6 +78709,7 @@ index 796860694d34..9828487f6eac 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -54983,10 +78744,6 @@ index 796860694d34..9828487f6eac 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -54996,14 +78753,26 @@ index 796860694d34..9828487f6eac 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -55025,9 +78794,10 @@ index 796860694d34..9828487f6eac 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -55037,10 +78807,6 @@ index 796860694d34..9828487f6eac 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -55054,35 +78820,31 @@ index 796860694d34..9828487f6eac 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("field_trial_parser_gn") -diff --git third_party/libwebrtc/rtc_base/experiments/jitter_upper_bound_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/jitter_upper_bound_experiment_gn/moz.build -index 205bd45fa52e..4f0f7113c8cc 100644 ---- third_party/libwebrtc/rtc_base/experiments/jitter_upper_bound_experiment_gn/moz.build -+++ third_party/libwebrtc/rtc_base/experiments/jitter_upper_bound_experiment_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("safe_minmax_gn") +diff --git third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build +index a477e2cd2de2..f8c37e47fe73 100644 +--- third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build ++++ third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -55091,7 +78853,7 @@ index 205bd45fa52e..4f0f7113c8cc 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -55099,7 +78861,7 @@ index 205bd45fa52e..4f0f7113c8cc 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -55140,6 +78902,7 @@ index 205bd45fa52e..4f0f7113c8cc 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -55174,10 +78937,6 @@ index 205bd45fa52e..4f0f7113c8cc 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -55194,6 +78953,24 @@ index 205bd45fa52e..4f0f7113c8cc 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -55228,10 +79005,10 @@ index 205bd45fa52e..4f0f7113c8cc 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -55245,35 +79022,40 @@ index 205bd45fa52e..4f0f7113c8cc 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("jitter_upper_bound_experiment_gn") -diff --git third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build -index 0c1a89402259..dfe03ddaab6e 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("sample_counter_gn") +diff --git third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build +index efdfb15485e3..d22a78d96416 100644 +--- third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build ++++ third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -55282,7 +79064,7 @@ index 0c1a89402259..dfe03ddaab6e 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -55290,7 +79072,7 @@ index 0c1a89402259..dfe03ddaab6e 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -55300,10 +79082,6 @@ index 0c1a89402259..dfe03ddaab6e 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -55331,6 +79109,7 @@ index 0c1a89402259..dfe03ddaab6e 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -55365,10 +79144,6 @@ index 0c1a89402259..dfe03ddaab6e 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -55378,14 +79153,26 @@ index 0c1a89402259..dfe03ddaab6e 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -55407,9 +79194,10 @@ index 0c1a89402259..dfe03ddaab6e 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -55419,10 +79207,6 @@ index 0c1a89402259..dfe03ddaab6e 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -55436,35 +79220,31 @@ index 0c1a89402259..dfe03ddaab6e 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("keyframe_interval_settings_experiment_gn") -diff --git third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build -index ad278ad750e3..d6145dd57a40 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("sanitizer_gn") +diff --git third_party/libwebrtc/rtc_base/socket_address_gn/moz.build third_party/libwebrtc/rtc_base/socket_address_gn/moz.build +index 8315d358e6ec..40ffca5c22d9 100644 +--- third_party/libwebrtc/rtc_base/socket_address_gn/moz.build ++++ third_party/libwebrtc/rtc_base/socket_address_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -55473,7 +79253,7 @@ index ad278ad750e3..d6145dd57a40 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -55481,7 +79261,7 @@ index ad278ad750e3..d6145dd57a40 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -55492,6 +79272,7 @@ index ad278ad750e3..d6145dd57a40 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ +- "GLESv2", - "log" - ] - @@ -55522,6 +79303,7 @@ index ad278ad750e3..d6145dd57a40 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -55558,6 +79340,9 @@ index ad278ad750e3..d6145dd57a40 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -55576,6 +79361,24 @@ index ad278ad750e3..d6145dd57a40 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -55610,10 +79413,10 @@ index ad278ad750e3..d6145dd57a40 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -55627,35 +79430,40 @@ index ad278ad750e3..d6145dd57a40 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("min_video_bitrate_experiment_gn") -diff --git third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build -index 9a719308c9e9..7b93898b9305 100644 ---- third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build -+++ third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("socket_address_gn") +diff --git third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build +index 43a7eff46eba..4ba64ef8e106 100644 +--- third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build ++++ third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -55664,7 +79472,7 @@ index 9a719308c9e9..7b93898b9305 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,115 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -55672,7 +79480,7 @@ index 9a719308c9e9..7b93898b9305 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -55683,6 +79491,7 @@ index 9a719308c9e9..7b93898b9305 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ +- "GLESv2", - "log" - ] - @@ -55713,6 +79522,7 @@ index 9a719308c9e9..7b93898b9305 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -55749,6 +79559,9 @@ index 9a719308c9e9..7b93898b9305 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -55760,14 +79573,26 @@ index 9a719308c9e9..7b93898b9305 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -157,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -55789,9 +79614,10 @@ index 9a719308c9e9..7b93898b9305 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -55801,10 +79627,6 @@ index 9a719308c9e9..7b93898b9305 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -55818,35 +79640,31 @@ index 9a719308c9e9..7b93898b9305 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("quality_rampup_experiment_gn") -diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build -index 0d22af1cf0d5..395d4e793243 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("socket_factory_gn") +diff --git third_party/libwebrtc/rtc_base/socket_gn/moz.build third_party/libwebrtc/rtc_base/socket_gn/moz.build +index 8fa7b5f8b019..d603411799ed 100644 +--- third_party/libwebrtc/rtc_base/socket_gn/moz.build ++++ third_party/libwebrtc/rtc_base/socket_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -55855,7 +79673,7 @@ index 0d22af1cf0d5..395d4e793243 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -55863,7 +79681,7 @@ index 0d22af1cf0d5..395d4e793243 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -55874,6 +79692,7 @@ index 0d22af1cf0d5..395d4e793243 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ +- "GLESv2", - "log" - ] - @@ -55904,6 +79723,7 @@ index 0d22af1cf0d5..395d4e793243 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -55940,6 +79760,9 @@ index 0d22af1cf0d5..395d4e793243 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -55958,6 +79781,24 @@ index 0d22af1cf0d5..395d4e793243 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -55992,10 +79833,10 @@ index 0d22af1cf0d5..395d4e793243 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -56009,35 +79850,40 @@ index 0d22af1cf0d5..395d4e793243 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("quality_scaler_settings_gn") -diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build -index e1c03ed03184..9f35859bb8b1 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("socket_gn") +diff --git third_party/libwebrtc/rtc_base/socket_server_gn/moz.build third_party/libwebrtc/rtc_base/socket_server_gn/moz.build +index 19fae93cf479..8f5896e37a22 100644 +--- third_party/libwebrtc/rtc_base/socket_server_gn/moz.build ++++ third_party/libwebrtc/rtc_base/socket_server_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -56046,7 +79892,7 @@ index e1c03ed03184..9f35859bb8b1 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,115 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -56054,7 +79900,7 @@ index e1c03ed03184..9f35859bb8b1 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -56065,6 +79911,7 @@ index e1c03ed03184..9f35859bb8b1 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ +- "GLESv2", - "log" - ] - @@ -56095,6 +79942,7 @@ index e1c03ed03184..9f35859bb8b1 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -56131,6 +79979,9 @@ index e1c03ed03184..9f35859bb8b1 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -56142,14 +79993,26 @@ index e1c03ed03184..9f35859bb8b1 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -157,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -56171,9 +80034,10 @@ index e1c03ed03184..9f35859bb8b1 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -56183,10 +80047,6 @@ index e1c03ed03184..9f35859bb8b1 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -56200,35 +80060,31 @@ index e1c03ed03184..9f35859bb8b1 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("quality_scaling_experiment_gn") -diff --git third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build -index 49f1182f5e38..e103b1dfe277 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("socket_server_gn") +diff --git third_party/libwebrtc/rtc_base/ssl_gn/moz.build third_party/libwebrtc/rtc_base/ssl_gn/moz.build +index 79c9fd515372..ed15371747a9 100644 +--- third_party/libwebrtc/rtc_base/ssl_gn/moz.build ++++ third_party/libwebrtc/rtc_base/ssl_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -56237,7 +80093,7 @@ index 49f1182f5e38..e103b1dfe277 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -56245,7 +80101,7 @@ index 49f1182f5e38..e103b1dfe277 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -56255,10 +80111,6 @@ index 49f1182f5e38..e103b1dfe277 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -56286,6 +80138,7 @@ index 49f1182f5e38..e103b1dfe277 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -56320,10 +80173,6 @@ index 49f1182f5e38..e103b1dfe277 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -56333,14 +80182,26 @@ index 49f1182f5e38..e103b1dfe277 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -56362,9 +80223,10 @@ index 49f1182f5e38..e103b1dfe277 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -56374,10 +80236,6 @@ index 49f1182f5e38..e103b1dfe277 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -56391,35 +80249,31 @@ index 49f1182f5e38..e103b1dfe277 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("rate_control_settings_gn") -diff --git third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build -index 8a15fa313c96..da0cd0519b1f 100644 ---- third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build -+++ third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("ssl_gn") +diff --git third_party/libwebrtc/rtc_base/stringutils_gn/moz.build third_party/libwebrtc/rtc_base/stringutils_gn/moz.build +index c2ae423ea9b5..a65888b3d464 100644 +--- third_party/libwebrtc/rtc_base/stringutils_gn/moz.build ++++ third_party/libwebrtc/rtc_base/stringutils_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -56428,7 +80282,7 @@ index 8a15fa313c96..da0cd0519b1f 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -47,179 +56,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -56436,7 +80290,7 @@ index 8a15fa313c96..da0cd0519b1f 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -56477,6 +80331,7 @@ index 8a15fa313c96..da0cd0519b1f 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -56511,10 +80366,6 @@ index 8a15fa313c96..da0cd0519b1f 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -56531,6 +80382,24 @@ index 8a15fa313c96..da0cd0519b1f 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -56565,10 +80434,10 @@ index 8a15fa313c96..da0cd0519b1f 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -56582,35 +80451,40 @@ index 8a15fa313c96..da0cd0519b1f 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("rtt_mult_experiment_gn") -diff --git third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build -index ba3b13a5f401..8b6e64b1cb26 100644 ---- third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build -+++ third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("stringutils_gn") +diff --git third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build +index 630648f5f5fa..2863ba28d144 100644 +--- third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build ++++ third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -56619,7 +80493,7 @@ index ba3b13a5f401..8b6e64b1cb26 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -56627,7 +80501,7 @@ index ba3b13a5f401..8b6e64b1cb26 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -56668,6 +80542,7 @@ index ba3b13a5f401..8b6e64b1cb26 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -56702,10 +80577,6 @@ index ba3b13a5f401..8b6e64b1cb26 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -56715,14 +80586,26 @@ index ba3b13a5f401..8b6e64b1cb26 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -56744,9 +80627,10 @@ index ba3b13a5f401..8b6e64b1cb26 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -56756,10 +80640,6 @@ index ba3b13a5f401..8b6e64b1cb26 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -56773,35 +80653,31 @@ index ba3b13a5f401..8b6e64b1cb26 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("stable_target_rate_experiment_gn") -diff --git third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build -index 58ee1ed4807f..f7256ede9e0f 100644 ---- third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build -+++ third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("swap_queue_gn") +diff --git third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build +index 34792dc4327c..fc8b3b58110e 100644 +--- third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build ++++ third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -56810,7 +80686,7 @@ index 58ee1ed4807f..f7256ede9e0f 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -56818,7 +80694,7 @@ index 58ee1ed4807f..f7256ede9e0f 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -56828,6 +80704,10 @@ index 58ee1ed4807f..f7256ede9e0f 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -56855,6 +80735,7 @@ index 58ee1ed4807f..f7256ede9e0f 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -56902,6 +80783,22 @@ index 58ee1ed4807f..f7256ede9e0f 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -56923,9 +80820,10 @@ index 58ee1ed4807f..f7256ede9e0f 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -56955,23 +80853,24 @@ index 58ee1ed4807f..f7256ede9e0f 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("gtest_prod_gn") -diff --git third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build -index ed9683f8b8ea..7f853cc4d082 100644 ---- third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build -+++ third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("mutex_gn") +diff --git third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build +index 85cf1f73b599..fb8a358b2eaa 100644 +--- third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build ++++ third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -56980,7 +80879,7 @@ index ed9683f8b8ea..7f853cc4d082 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -56988,7 +80887,7 @@ index ed9683f8b8ea..7f853cc4d082 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -56998,6 +80897,10 @@ index ed9683f8b8ea..7f853cc4d082 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -57025,6 +80928,7 @@ index ed9683f8b8ea..7f853cc4d082 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -57068,9 +80972,31 @@ index ed9683f8b8ea..7f853cc4d082 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -57105,6 +81031,10 @@ index ed9683f8b8ea..7f853cc4d082 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -57118,30 +81048,40 @@ index ed9683f8b8ea..7f853cc4d082 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("ignore_wundef_gn") -diff --git third_party/libwebrtc/rtc_base/logging_gn/moz.build third_party/libwebrtc/rtc_base/logging_gn/moz.build -index 7a53cb844a09..e3906cc1cc9a 100644 ---- third_party/libwebrtc/rtc_base/logging_gn/moz.build -+++ third_party/libwebrtc/rtc_base/logging_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("sequence_checker_internal_gn") +diff --git third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build +index 363b084539be..1fe57f535305 100644 +--- third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build ++++ third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -57150,7 +81090,7 @@ index 7a53cb844a09..e3906cc1cc9a 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -57158,7 +81098,7 @@ index 7a53cb844a09..e3906cc1cc9a 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -57168,10 +81108,6 @@ index 7a53cb844a09..e3906cc1cc9a 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -57199,6 +81135,7 @@ index 7a53cb844a09..e3906cc1cc9a 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -57233,10 +81170,6 @@ index 7a53cb844a09..e3906cc1cc9a 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -57253,6 +81186,24 @@ index 7a53cb844a09..e3906cc1cc9a 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -57287,10 +81238,10 @@ index 7a53cb844a09..e3906cc1cc9a 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -57304,35 +81255,40 @@ index 7a53cb844a09..e3906cc1cc9a 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("logging_gn") -diff --git third_party/libwebrtc/rtc_base/macromagic_gn/moz.build third_party/libwebrtc/rtc_base/macromagic_gn/moz.build -index 5f74a7fb3e88..c39e685fc872 100644 ---- third_party/libwebrtc/rtc_base/macromagic_gn/moz.build -+++ third_party/libwebrtc/rtc_base/macromagic_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("yield_gn") +diff --git third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build +index 9356f30910a3..edfb4475bbd2 100644 +--- third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build ++++ third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -57341,7 +81297,7 @@ index 5f74a7fb3e88..c39e685fc872 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -57349,7 +81305,7 @@ index 5f74a7fb3e88..c39e685fc872 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -57359,6 +81315,10 @@ index 5f74a7fb3e88..c39e685fc872 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -57386,6 +81346,7 @@ index 5f74a7fb3e88..c39e685fc872 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -57429,9 +81390,31 @@ index 5f74a7fb3e88..c39e685fc872 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -57466,6 +81449,10 @@ index 5f74a7fb3e88..c39e685fc872 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -57479,30 +81466,40 @@ index 5f74a7fb3e88..c39e685fc872 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 95d3a561c48d..fd6544852be2 100644 ---- third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build -+++ third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("yield_policy_gn") +diff --git third_party/libwebrtc/rtc_base/system/arch_gn/moz.build third_party/libwebrtc/rtc_base/system/arch_gn/moz.build +index 4f8f93c154e2..a836f5db63f0 100644 +--- third_party/libwebrtc/rtc_base/system/arch_gn/moz.build ++++ third_party/libwebrtc/rtc_base/system/arch_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -57511,7 +81508,7 @@ index 95d3a561c48d..fd6544852be2 100644 FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -57519,7 +81516,7 @@ index 95d3a561c48d..fd6544852be2 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -57529,10 +81526,6 @@ index 95d3a561c48d..fd6544852be2 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -57560,6 +81553,7 @@ index 95d3a561c48d..fd6544852be2 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -57603,14 +81597,26 @@ index 95d3a561c48d..fd6544852be2 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -57632,9 +81638,10 @@ index 95d3a561c48d..fd6544852be2 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -57643,12 +81650,7 @@ index 95d3a561c48d..fd6544852be2 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -57663,33 +81665,189 @@ index 95d3a561c48d..fd6544852be2 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("aligned_malloc_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 48e810456b54..75a4524f7852 100644 ---- third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build -+++ third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + 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 ab3e701885e8..000000000000 +--- third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build ++++ /dev/null +@@ -1,80 +0,0 @@ +-# This Source Code Form is subject to the terms of the Mozilla Public +-# License, v. 2.0. If a copy of the MPL was not distributed with this +-# file, You can obtain one at http://mozilla.org/MPL/2.0/. +- +- +- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### +- ### DO NOT edit it by hand. ### +- +-COMPILE_FLAGS["OS_INCLUDES"] = [] +-AllowCompilerWarnings() +- +-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True +-DEFINES["RTC_ENABLE_VP9"] = True +-DEFINES["WEBRTC_ARCH_ARM"] = True +-DEFINES["WEBRTC_ARCH_ARM_V7"] = True +-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" +-DEFINES["WEBRTC_HAS_NEON"] = True +-DEFINES["WEBRTC_LIBRARY_IMPL"] = True +-DEFINES["WEBRTC_LINUX"] = True +-DEFINES["WEBRTC_MOZILLA_BUILD"] = True +-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +-DEFINES["WEBRTC_POSIX"] = True +-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +-DEFINES["_GNU_SOURCE"] = True +-DEFINES["__STDC_CONSTANT_MACROS"] = True +-DEFINES["__STDC_FORMAT_MACROS"] = True +- +-FINAL_LIBRARY = "webrtc" +- +- +-LOCAL_INCLUDES += [ +- "!/ipc/ipdl/_ipdlheaders", +- "!/third_party/libwebrtc/gen", +- "/ipc/chromium/src", +- "/third_party/libwebrtc/", +- "/third_party/libwebrtc/third_party/abseil-cpp/", +- "/tools/profiler/public" +-] +- +-if not CONFIG["MOZ_DEBUG"]: +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" +- DEFINES["NDEBUG"] = True +- DEFINES["NVALGRIND"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1": +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- DEFINES["_DEBUG"] = True +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-Library("asm_defines_gn") +diff --git third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build +deleted file mode 100644 +index f897cf46fc39..000000000000 +--- third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build ++++ /dev/null +@@ -1,67 +0,0 @@ +-# This Source Code Form is subject to the terms of the Mozilla Public +-# License, v. 2.0. If a copy of the MPL was not distributed with this +-# file, You can obtain one at http://mozilla.org/MPL/2.0/. +- +- +- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### +- ### DO NOT edit it by hand. ### +- +-CMMFLAGS += [ +- "-fobjc-arc" +-] +- +-COMPILE_FLAGS["OS_INCLUDES"] = [] +-AllowCompilerWarnings() +- +-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True +-DEFINES["RTC_ENABLE_VP9"] = True +-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" +-DEFINES["WEBRTC_LIBRARY_IMPL"] = True +-DEFINES["WEBRTC_MAC"] = True +-DEFINES["WEBRTC_MOZILLA_BUILD"] = True +-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +-DEFINES["WEBRTC_POSIX"] = True +-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +-DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +-DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +-DEFINES["__STDC_CONSTANT_MACROS"] = True +-DEFINES["__STDC_FORMAT_MACROS"] = True +- +-FINAL_LIBRARY = "webrtc" +- +- +-LOCAL_INCLUDES += [ +- "!/ipc/ipdl/_ipdlheaders", +- "!/third_party/libwebrtc/gen", +- "/ipc/chromium/src", +- "/third_party/libwebrtc/", +- "/third_party/libwebrtc/third_party/abseil-cpp/", +- "/tools/profiler/public" +-] +- +-UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/rtc_base/system/cocoa_threading.mm" +-] +- +-if not CONFIG["MOZ_DEBUG"]: +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" +- DEFINES["NDEBUG"] = True +- DEFINES["NVALGRIND"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1": +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- DEFINES["_DEBUG"] = True +- +-if CONFIG["CPU_ARCH"] == "aarch64": +- +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["CPU_ARCH"] == "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 9954e2772e10..7cc6dfb3b3a6 100644 +--- third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build ++++ third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -57698,7 +81856,7 @@ index 48e810456b54..75a4524f7852 100644 FINAL_LIBRARY = "webrtc" -@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -57706,7 +81864,7 @@ index 48e810456b54..75a4524f7852 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -57716,6 +81874,10 @@ index 48e810456b54..75a4524f7852 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -57743,6 +81905,7 @@ index 48e810456b54..75a4524f7852 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -57793,6 +81956,24 @@ index 48e810456b54..75a4524f7852 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -57827,10 +82008,10 @@ index 48e810456b54..75a4524f7852 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -57844,35 +82025,113 @@ index 48e810456b54..75a4524f7852 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("sent_packet_gn") -diff --git third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build -index 2505bbb202bf..909662de36f2 100644 ---- third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build -+++ third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + 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 99fbd80dd967..000000000000 +--- third_party/libwebrtc/rtc_base/system/gcd_helpers_gn/moz.build ++++ /dev/null +@@ -1,67 +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["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True +-DEFINES["RTC_ENABLE_VP9"] = True +-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" +-DEFINES["WEBRTC_LIBRARY_IMPL"] = True +-DEFINES["WEBRTC_MAC"] = True +-DEFINES["WEBRTC_MOZILLA_BUILD"] = True +-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +-DEFINES["WEBRTC_POSIX"] = True +-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +-DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +-DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +-DEFINES["__STDC_CONSTANT_MACROS"] = True +-DEFINES["__STDC_FORMAT_MACROS"] = True +- +-FINAL_LIBRARY = "webrtc" +- +- +-LOCAL_INCLUDES += [ +- "!/ipc/ipdl/_ipdlheaders", +- "!/third_party/libwebrtc/gen", +- "/ipc/chromium/src", +- "/third_party/libwebrtc/", +- "/third_party/libwebrtc/third_party/abseil-cpp/", +- "/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["CPU_ARCH"] == "aarch64": +- +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["CPU_ARCH"] == "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 396d7286299f..ae27ee47b74f 100644 +--- third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build ++++ third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -57881,7 +82140,7 @@ index 2505bbb202bf..909662de36f2 100644 FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -57889,7 +82148,7 @@ index 2505bbb202bf..909662de36f2 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -57899,10 +82158,6 @@ index 2505bbb202bf..909662de36f2 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -57930,6 +82185,7 @@ index 2505bbb202bf..909662de36f2 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -57964,10 +82220,6 @@ index 2505bbb202bf..909662de36f2 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -57977,14 +82229,26 @@ index 2505bbb202bf..909662de36f2 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -58006,9 +82270,10 @@ index 2505bbb202bf..909662de36f2 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -58018,10 +82283,6 @@ index 2505bbb202bf..909662de36f2 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -58035,35 +82296,31 @@ index 2505bbb202bf..909662de36f2 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("platform_thread_gn") -diff --git third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build -index ad03c153be01..f4139ccc3455 100644 ---- third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build -+++ third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("ignore_warnings_gn") +diff --git third_party/libwebrtc/rtc_base/system/inline_gn/moz.build third_party/libwebrtc/rtc_base/system/inline_gn/moz.build +index 110c04a6be19..47a6efea00c5 100644 +--- third_party/libwebrtc/rtc_base/system/inline_gn/moz.build ++++ third_party/libwebrtc/rtc_base/system/inline_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -58072,7 +82329,7 @@ index ad03c153be01..f4139ccc3455 100644 FINAL_LIBRARY = "webrtc" -@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -58080,7 +82337,7 @@ index ad03c153be01..f4139ccc3455 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -58117,6 +82374,7 @@ index ad03c153be01..f4139ccc3455 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -58160,193 +82418,26 @@ index ad03c153be01..f4139ccc3455 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" -- --if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -- -- CXXFLAGS += [ -- "-msse2" -- ] -- -- OS_LIBS += [ -- "android_support" -- ] -- --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] + if CONFIG["CPU_ARCH"] == "mips32": + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["CPU_ARCH"] == "mips64": - - DEFINES["_GNU_SOURCE"] = True -- - Library("platform_thread_types_gn") -diff --git third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build -index 220b4dc546a6..e2603dbb9a7e 100644 ---- third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build -+++ third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True -+DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["_FILE_OFFSET_BITS"] = "64" -+DEFINES["_LARGEFILE64_SOURCE"] = True -+DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True - FINAL_LIBRARY = "webrtc" - -@@ -36,144 +45,11 @@ 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"] = "r20_1" -- DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True -- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_AURA"] = "1" -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_NSS_CERTS"] = "1" -- DEFINES["USE_OZONE"] = "1" -- DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True -- DEFINES["NOMINMAX"] = True -- DEFINES["NTDDI_VERSION"] = "0x0A000000" -- DEFINES["PSAPI_VERSION"] = "2" -- DEFINES["UNICODE"] = True -- DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True -- DEFINES["WIN32"] = True -- DEFINES["WIN32_LEAN_AND_MEAN"] = True -- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" -- DEFINES["WINVER"] = "0x0A00" -- DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_RAND_S"] = True -- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True -- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True -- DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True -- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True -- DEFINES["_SECURE_ATL"] = True -- DEFINES["_UNICODE"] = True -- DEFINES["_WIN32_WINNT"] = "0x0A00" -- DEFINES["_WINDOWS"] = True -- DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True + if CONFIG["CPU_ARCH"] == "x86": - if CONFIG["CPU_ARCH"] == "aarch64": +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True + DEFINES["WEBRTC_ENABLE_AVX2"] = True --if CONFIG["CPU_ARCH"] == "arm": -- -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True -- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -58368,9 +82459,10 @@ index 220b4dc546a6..e2603dbb9a7e 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -58400,23 +82492,24 @@ index 220b4dc546a6..e2603dbb9a7e 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("protobuf_utils_gn") -diff --git third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build -index 5a4719b40967..c0860f3523c3 100644 ---- third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build -+++ third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("inline_gn") +diff --git third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build +index bbf86f67bb61..8b4b89ce8c24 100644 +--- third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build ++++ third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -58425,7 +82518,7 @@ index 5a4719b40967..c0860f3523c3 100644 FINAL_LIBRARY = "webrtc" -@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -58433,7 +82526,7 @@ index 5a4719b40967..c0860f3523c3 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -58443,10 +82536,6 @@ index 5a4719b40967..c0860f3523c3 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -58471,13 +82560,10 @@ index 5a4719b40967..c0860f3523c3 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -58512,13 +82598,6 @@ index 5a4719b40967..c0860f3523c3 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -58528,14 +82607,26 @@ index 5a4719b40967..c0860f3523c3 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -58557,9 +82648,10 @@ index 5a4719b40967..c0860f3523c3 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -58568,12 +82660,7 @@ index 5a4719b40967..c0860f3523c3 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -58588,33 +82675,30 @@ index 5a4719b40967..c0860f3523c3 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("rate_limiter_gn") -diff --git third_party/libwebrtc/rtc_base/refcount_gn/moz.build third_party/libwebrtc/rtc_base/refcount_gn/moz.build -index 58de50d22f5c..da5cfa7be0be 100644 ---- third_party/libwebrtc/rtc_base/refcount_gn/moz.build -+++ third_party/libwebrtc/rtc_base/refcount_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("no_unique_address_gn") +diff --git third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build +index a26fbd0aecc7..7773038a2267 100644 +--- third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build ++++ third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -58623,7 +82707,7 @@ index 58de50d22f5c..da5cfa7be0be 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -58631,7 +82715,7 @@ index 58de50d22f5c..da5cfa7be0be 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -58668,6 +82752,7 @@ index 58de50d22f5c..da5cfa7be0be 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -58715,6 +82800,22 @@ index 58de50d22f5c..da5cfa7be0be 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -58736,9 +82837,10 @@ index 58de50d22f5c..da5cfa7be0be 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -58768,23 +82870,24 @@ index 58de50d22f5c..da5cfa7be0be 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("refcount_gn") -diff --git third_party/libwebrtc/rtc_base/rtc_base_approved_gn/moz.build third_party/libwebrtc/rtc_base/rtc_base_approved_gn/moz.build -index c44f0df60918..27717bb75fc8 100644 ---- third_party/libwebrtc/rtc_base/rtc_base_approved_gn/moz.build -+++ third_party/libwebrtc/rtc_base/rtc_base_approved_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("rtc_export_gn") +diff --git third_party/libwebrtc/rtc_base/system/unused_gn/moz.build third_party/libwebrtc/rtc_base/system/unused_gn/moz.build +index c53e1ab3ba55..3c5c6131f5b6 100644 +--- third_party/libwebrtc/rtc_base/system/unused_gn/moz.build ++++ third_party/libwebrtc/rtc_base/system/unused_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -58793,7 +82896,7 @@ index c44f0df60918..27717bb75fc8 100644 FINAL_LIBRARY = "webrtc" -@@ -53,168 +62,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -58801,7 +82904,7 @@ index c44f0df60918..27717bb75fc8 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -58811,10 +82914,6 @@ index c44f0df60918..27717bb75fc8 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -58842,6 +82941,7 @@ index c44f0df60918..27717bb75fc8 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -58876,14 +82976,6 @@ index c44f0df60918..27717bb75fc8 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/rtc_base/win/windows_version.cc" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -58893,14 +82985,26 @@ index c44f0df60918..27717bb75fc8 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -58922,9 +83026,10 @@ index c44f0df60918..27717bb75fc8 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -58933,12 +83038,7 @@ index c44f0df60918..27717bb75fc8 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -58953,33 +83053,30 @@ index c44f0df60918..27717bb75fc8 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("rtc_base_approved_gn") -diff --git third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build -index d3d695101667..be3c6b888802 100644 ---- third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build -+++ third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("unused_gn") +diff --git third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build +index 6d5043ae77f0..68764f971a8c 100644 +--- third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build ++++ third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -58988,15 +83085,7 @@ index d3d695101667..be3c6b888802 100644 FINAL_LIBRARY = "webrtc" -@@ -34,6 +43,7 @@ UNIFIED_SOURCES += [ - "/third_party/libwebrtc/rtc_base/crypt_string.cc", - "/third_party/libwebrtc/rtc_base/data_rate_limiter.cc", - "/third_party/libwebrtc/rtc_base/file_rotating_stream.cc", -+ "/third_party/libwebrtc/rtc_base/ifaddrs_converter.cc", - "/third_party/libwebrtc/rtc_base/ip_address.cc", - "/third_party/libwebrtc/rtc_base/log_sinks.cc", - "/third_party/libwebrtc/rtc_base/message_handler.cc", -@@ -56,198 +66,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -59004,7 +83093,7 @@ index d3d695101667..be3c6b888802 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -59014,16 +83103,6 @@ index d3d695101667..be3c6b888802 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "GLESv2", -- "log" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/rtc_base/ifaddrs_android.cc", -- "/third_party/libwebrtc/rtc_base/ifaddrs_converter.cc" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -59033,11 +83112,6 @@ index d3d695101667..be3c6b888802 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/rtc_base/ifaddrs_converter.cc", -- "/third_party/libwebrtc/rtc_base/mac_ifaddrs_converter.cc" -- ] -- -if CONFIG["OS_TARGET"] == "Linux": - - DEFINES["USE_AURA"] = "1" @@ -59053,18 +83127,10 @@ index d3d695101667..be3c6b888802 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/rtc_base/ifaddrs_converter.cc" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -59074,10 +83140,6 @@ index d3d695101667..be3c6b888802 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/rtc_base/ifaddrs_converter.cc" -- ] -- -if CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True @@ -59092,7 +83154,6 @@ index d3d695101667..be3c6b888802 100644 - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True @@ -59104,19 +83165,6 @@ index d3d695101667..be3c6b888802 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/rtc_base/win32.cc", -- "/third_party/libwebrtc/rtc_base/win32_socket_server.cc", -- "/third_party/libwebrtc/rtc_base/win32_window.cc" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -59126,14 +83174,26 @@ index d3d695101667..be3c6b888802 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -59155,9 +83215,10 @@ index d3d695101667..be3c6b888802 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -59166,12 +83227,7 @@ index d3d695101667..be3c6b888802 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -59186,33 +83242,30 @@ index d3d695101667..be3c6b888802 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("rtc_base_gn") -diff --git third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build -index de2d81e60011..8220755afb39 100644 ---- third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build -+++ third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("warn_current_thread_is_deadlocked_gn") +diff --git third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build +index 8aecd5889008..677563f0eafb 100644 +--- third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build ++++ third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -59221,7 +83274,7 @@ index de2d81e60011..8220755afb39 100644 FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -59229,7 +83282,7 @@ index de2d81e60011..8220755afb39 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -59267,9 +83320,14 @@ index de2d81e60011..8220755afb39 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -59304,6 +83362,13 @@ index de2d81e60011..8220755afb39 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -59320,6 +83385,24 @@ index de2d81e60011..8220755afb39 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -59353,8 +83436,7 @@ index de2d81e60011..8220755afb39 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -59372,34 +83454,40 @@ index de2d81e60011..8220755afb39 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("rtc_event_gn") -diff --git third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build -index ddb6df7919ab..17814a3cc24a 100644 ---- third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build -+++ third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("repeating_task_gn") +diff --git third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build +index 6077e21b3779..af27c83c7e93 100644 +--- third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build ++++ third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -59408,7 +83496,7 @@ index ddb6df7919ab..17814a3cc24a 100644 FINAL_LIBRARY = "webrtc" -@@ -42,164 +51,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -59416,7 +83504,7 @@ index ddb6df7919ab..17814a3cc24a 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -59457,6 +83545,7 @@ index ddb6df7919ab..17814a3cc24a 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -59491,10 +83580,6 @@ index ddb6df7919ab..17814a3cc24a 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -59511,6 +83596,24 @@ index ddb6df7919ab..17814a3cc24a 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -59545,10 +83648,10 @@ index ddb6df7919ab..17814a3cc24a 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -59562,35 +83665,40 @@ index ddb6df7919ab..17814a3cc24a 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("rtc_numerics_gn") -diff --git third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build -index 7ddc659b10cc..29edd94b27df 100644 ---- third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build -+++ third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("base64_gn") +diff --git third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build +index 3f4690993100..c78bc1de22c4 100644 +--- third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build ++++ third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -59599,7 +83707,7 @@ index 7ddc659b10cc..29edd94b27df 100644 FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -59607,7 +83715,7 @@ index 7ddc659b10cc..29edd94b27df 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -59617,10 +83725,6 @@ index 7ddc659b10cc..29edd94b27df 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -59648,6 +83752,7 @@ index 7ddc659b10cc..29edd94b27df 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -59698,6 +83803,24 @@ index 7ddc659b10cc..29edd94b27df 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -59731,8 +83854,7 @@ index 7ddc659b10cc..29edd94b27df 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -59750,34 +83872,40 @@ index 7ddc659b10cc..29edd94b27df 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("rtc_task_queue_gn") -diff --git third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build -index d9eff0756143..aeb9fff60f31 100644 ---- third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build -+++ third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("sigslot_gn") +diff --git third_party/libwebrtc/rtc_base/threading_gn/moz.build third_party/libwebrtc/rtc_base/threading_gn/moz.build +index 39235d88fc45..74684735d856 100644 +--- third_party/libwebrtc/rtc_base/threading_gn/moz.build ++++ third_party/libwebrtc/rtc_base/threading_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -59786,7 +83914,7 @@ index d9eff0756143..aeb9fff60f31 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -48,187 +57,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -59794,7 +83922,7 @@ index d9eff0756143..aeb9fff60f31 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -59804,6 +83932,11 @@ index d9eff0756143..aeb9fff60f31 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "GLESv2", +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -59831,6 +83964,7 @@ index d9eff0756143..aeb9fff60f31 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -59865,6 +83999,13 @@ index d9eff0756143..aeb9fff60f31 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -59874,9 +84015,31 @@ index d9eff0756143..aeb9fff60f31 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -59911,6 +84074,10 @@ index d9eff0756143..aeb9fff60f31 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -59924,30 +84091,41 @@ index d9eff0756143..aeb9fff60f31 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 14051d1182b5..0492472620c0 100644 ---- third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build -+++ third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("threading_gn") +diff --git third_party/libwebrtc/rtc_base/timeutils_gn/moz.build third_party/libwebrtc/rtc_base/timeutils_gn/moz.build +index 3f184279a3a0..432c438bdad6 100644 +--- third_party/libwebrtc/rtc_base/timeutils_gn/moz.build ++++ third_party/libwebrtc/rtc_base/timeutils_gn/moz.build +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" + DEFINES["WEBRTC_EXCLUDE_SYSTEM_TIME"] = True DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +DEFINES["WEBRTC_POSIX"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True @@ -59956,7 +84134,7 @@ index 14051d1182b5..0492472620c0 100644 FINAL_LIBRARY = "webrtc" -@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,183 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -59964,7 +84142,7 @@ index 14051d1182b5..0492472620c0 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -60005,6 +84183,7 @@ index 14051d1182b5..0492472620c0 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -60039,6 +84218,10 @@ index 14051d1182b5..0492472620c0 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -60048,9 +84231,31 @@ index 14051d1182b5..0492472620c0 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -60085,6 +84290,10 @@ index 14051d1182b5..0492472620c0 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -60098,30 +84307,40 @@ index 14051d1182b5..0492472620c0 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 e23ba45efdfa..d813100d1516 100644 ---- third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build -+++ third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("timeutils_gn") +diff --git third_party/libwebrtc/rtc_base/type_traits_gn/moz.build third_party/libwebrtc/rtc_base/type_traits_gn/moz.build +index b5c9fb51224c..7ff959ba5f38 100644 +--- third_party/libwebrtc/rtc_base/type_traits_gn/moz.build ++++ third_party/libwebrtc/rtc_base/type_traits_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -60130,7 +84349,7 @@ index e23ba45efdfa..d813100d1516 100644 FINAL_LIBRARY = "webrtc" -@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -60138,7 +84357,7 @@ index e23ba45efdfa..d813100d1516 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -60148,10 +84367,6 @@ index e23ba45efdfa..d813100d1516 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -60179,6 +84394,7 @@ index e23ba45efdfa..d813100d1516 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -60226,6 +84442,22 @@ index e23ba45efdfa..d813100d1516 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -60247,9 +84479,10 @@ index e23ba45efdfa..d813100d1516 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -60279,23 +84512,24 @@ index e23ba45efdfa..d813100d1516 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("safe_minmax_gn") -diff --git third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build -index c79228b49449..c8052f5370f9 100644 ---- third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build -+++ third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("type_traits_gn") +diff --git third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build +index 4ff4d51c78ea..93be9abd91cd 100644 +--- third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build ++++ third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -60304,7 +84538,7 @@ index c79228b49449..c8052f5370f9 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -60312,7 +84546,7 @@ index c79228b49449..c8052f5370f9 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -60349,6 +84583,7 @@ index c79228b49449..c8052f5370f9 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -60396,6 +84631,22 @@ index c79228b49449..c8052f5370f9 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -60417,9 +84668,10 @@ index c79228b49449..c8052f5370f9 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -60449,23 +84701,24 @@ index c79228b49449..c8052f5370f9 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("sanitizer_gn") -diff --git third_party/libwebrtc/rtc_base/stringutils_gn/moz.build third_party/libwebrtc/rtc_base/stringutils_gn/moz.build -index d2438210af52..3ed02b71257d 100644 ---- third_party/libwebrtc/rtc_base/stringutils_gn/moz.build -+++ third_party/libwebrtc/rtc_base/stringutils_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("unique_id_generator_gn") +diff --git third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build +index 35e3af076731..22bf007b975e 100644 +--- third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build ++++ third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -60474,7 +84727,7 @@ index d2438210af52..3ed02b71257d 100644 FINAL_LIBRARY = "webrtc" -@@ -44,160 +53,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -60482,7 +84735,7 @@ index d2438210af52..3ed02b71257d 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -60523,6 +84776,7 @@ index d2438210af52..3ed02b71257d 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -60566,201 +84820,26 @@ index d2438210af52..3ed02b71257d 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" -- --if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] + if CONFIG["CPU_ARCH"] == "mips32": -- OS_LIBS += [ -- "android_support" -- ] -- --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- -- CXXFLAGS += [ -- "-msse2" -- ] -- + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["CPU_ARCH"] == "mips64": - - DEFINES["_GNU_SOURCE"] = True -- - Library("stringutils_gn") -diff --git third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build -index 9916bbdc542a..7a927cc9e3ed 100644 ---- third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build -+++ third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True -+DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["_FILE_OFFSET_BITS"] = "64" -+DEFINES["_LARGEFILE64_SOURCE"] = True -+DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True - FINAL_LIBRARY = "webrtc" - -@@ -40,160 +49,17 @@ 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"] = "r20_1" -- DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- -- OS_LIBS += [ -- "log" -- ] -- --if CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True -- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_AURA"] = "1" -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_NSS_CERTS"] = "1" -- DEFINES["USE_OZONE"] = "1" -- DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True -- DEFINES["NOMINMAX"] = True -- DEFINES["NTDDI_VERSION"] = "0x0A000000" -- DEFINES["PSAPI_VERSION"] = "2" -- DEFINES["UNICODE"] = True -- DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True -- DEFINES["WIN32"] = True -- DEFINES["WIN32_LEAN_AND_MEAN"] = True -- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" -- DEFINES["WINVER"] = "0x0A00" -- DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_RAND_S"] = True -- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True -- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True -- DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True -- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True -- DEFINES["_SECURE_ATL"] = True -- DEFINES["_UNICODE"] = True -- DEFINES["_WIN32_WINNT"] = "0x0A00" -- DEFINES["_WINDOWS"] = True -- DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True + if CONFIG["CPU_ARCH"] == "x86": - if CONFIG["CPU_ARCH"] == "aarch64": +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True + DEFINES["WEBRTC_ENABLE_AVX2"] = True --if CONFIG["CPU_ARCH"] == "arm": -- -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True -- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -60782,9 +84861,10 @@ index 9916bbdc542a..7a927cc9e3ed 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -60793,12 +84873,7 @@ index 9916bbdc542a..7a927cc9e3ed 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -60813,33 +84888,30 @@ index 9916bbdc542a..7a927cc9e3ed 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("mutex_gn") -diff --git third_party/libwebrtc/rtc_base/synchronization/rw_lock_wrapper_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/rw_lock_wrapper_gn/moz.build -index 10fcd89c276d..16f607e466b4 100644 ---- third_party/libwebrtc/rtc_base/synchronization/rw_lock_wrapper_gn/moz.build -+++ third_party/libwebrtc/rtc_base/synchronization/rw_lock_wrapper_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - + Library("unit_base_gn") +diff --git third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build +index 93a833f2a3a7..c1c245b6e62b 100644 +--- third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build ++++ third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -60848,15 +84920,7 @@ index 10fcd89c276d..16f607e466b4 100644 FINAL_LIBRARY = "webrtc" -@@ -28,6 +37,7 @@ LOCAL_INCLUDES += [ - ] - - UNIFIED_SOURCES += [ -+ "/third_party/libwebrtc/rtc_base/synchronization/rw_lock_posix.cc", - "/third_party/libwebrtc/rtc_base/synchronization/rw_lock_wrapper.cc" - ] - -@@ -40,180 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -60864,7 +84928,7 @@ index 10fcd89c276d..16f607e466b4 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -60874,8 +84938,8 @@ index 10fcd89c276d..16f607e466b4 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/rtc_base/synchronization/rw_lock_posix.cc" +- OS_LIBS += [ +- "log" - ] - -if CONFIG["OS_TARGET"] == "Darwin": @@ -60887,10 +84951,6 @@ index 10fcd89c276d..16f607e466b4 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/rtc_base/synchronization/rw_lock_posix.cc" -- ] -- -if CONFIG["OS_TARGET"] == "Linux": - - DEFINES["USE_AURA"] = "1" @@ -60906,13 +84966,10 @@ index 10fcd89c276d..16f607e466b4 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/rtc_base/synchronization/rw_lock_posix.cc" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -60922,10 +84979,6 @@ index 10fcd89c276d..16f607e466b4 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/rtc_base/synchronization/rw_lock_posix.cc" -- ] -- -if CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True @@ -60951,14 +85004,6 @@ index 10fcd89c276d..16f607e466b4 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/rtc_base/synchronization/rw_lock_win.cc" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -60975,6 +85020,24 @@ index 10fcd89c276d..16f607e466b4 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -61008,8 +85071,7 @@ index 10fcd89c276d..16f607e466b4 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -61027,34 +85089,499 @@ index 10fcd89c276d..16f607e466b4 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("rw_lock_wrapper_gn") -diff --git third_party/libwebrtc/rtc_base/synchronization/sequence_checker_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/sequence_checker_gn/moz.build -index 45b4ce477f94..9c964e79f915 100644 ---- third_party/libwebrtc/rtc_base/synchronization/sequence_checker_gn/moz.build -+++ third_party/libwebrtc/rtc_base/synchronization/sequence_checker_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("weak_ptr_gn") +diff --git third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build +deleted file mode 100644 +index d5882af2bb01..000000000000 +--- third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build ++++ /dev/null +@@ -1,84 +0,0 @@ +-# This Source Code Form is subject to the terms of the Mozilla Public +-# License, v. 2.0. If a copy of the MPL was not distributed with this +-# file, You can obtain one at http://mozilla.org/MPL/2.0/. +- +- +- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### +- ### DO NOT edit it by hand. ### +- +-COMPILE_FLAGS["OS_INCLUDES"] = [] +-AllowCompilerWarnings() +- +-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +-DEFINES["NOMINMAX"] = True +-DEFINES["NTDDI_VERSION"] = "0x0A000000" +-DEFINES["PSAPI_VERSION"] = "2" +-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True +-DEFINES["RTC_ENABLE_VP9"] = True +-DEFINES["UNICODE"] = True +-DEFINES["USE_AURA"] = "1" +-DEFINES["WEBRTC_ENABLE_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_RAND_S"] = True +-DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +-DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +-DEFINES["_HAS_EXCEPTIONS"] = "0" +-DEFINES["_HAS_NODISCARD"] = True +-DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +-DEFINES["_SECURE_ATL"] = True +-DEFINES["_UNICODE"] = True +-DEFINES["_WIN32_WINNT"] = "0x0A00" +-DEFINES["_WINDOWS"] = True +-DEFINES["__STD_C"] = True +- +-FINAL_LIBRARY = "webrtc" +- +- +-LOCAL_INCLUDES += [ +- "!/ipc/ipdl/_ipdlheaders", +- "!/third_party/libwebrtc/gen", +- "/ipc/chromium/src", +- "/third_party/libwebrtc/", +- "/third_party/libwebrtc/third_party/abseil-cpp/", +- "/tools/profiler/public" +-] +- +-UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/rtc_base/win/create_direct3d_device.cc" +-] +- +-if not CONFIG["MOZ_DEBUG"]: +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" +- DEFINES["NDEBUG"] = True +- DEFINES["NVALGRIND"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1": +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["CPU_ARCH"] == "aarch64": +- +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["CPU_ARCH"] == "x86": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "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 d2449d9860b7..000000000000 +--- third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build ++++ /dev/null +@@ -1,84 +0,0 @@ +-# This Source Code Form is subject to the terms of the Mozilla Public +-# License, v. 2.0. If a copy of the MPL was not distributed with this +-# file, You can obtain one at http://mozilla.org/MPL/2.0/. +- +- +- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### +- ### DO NOT edit it by hand. ### +- +-COMPILE_FLAGS["OS_INCLUDES"] = [] +-AllowCompilerWarnings() +- +-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +-DEFINES["NOMINMAX"] = True +-DEFINES["NTDDI_VERSION"] = "0x0A000000" +-DEFINES["PSAPI_VERSION"] = "2" +-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True +-DEFINES["RTC_ENABLE_VP9"] = True +-DEFINES["UNICODE"] = True +-DEFINES["USE_AURA"] = "1" +-DEFINES["WEBRTC_ENABLE_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_RAND_S"] = True +-DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +-DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +-DEFINES["_HAS_EXCEPTIONS"] = "0" +-DEFINES["_HAS_NODISCARD"] = True +-DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +-DEFINES["_SECURE_ATL"] = True +-DEFINES["_UNICODE"] = True +-DEFINES["_WIN32_WINNT"] = "0x0A00" +-DEFINES["_WINDOWS"] = True +-DEFINES["__STD_C"] = True +- +-FINAL_LIBRARY = "webrtc" +- +- +-LOCAL_INCLUDES += [ +- "!/ipc/ipdl/_ipdlheaders", +- "!/third_party/libwebrtc/gen", +- "/ipc/chromium/src", +- "/third_party/libwebrtc/", +- "/third_party/libwebrtc/third_party/abseil-cpp/", +- "/tools/profiler/public" +-] +- +-UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/rtc_base/win/get_activation_factory.cc" +-] +- +-if not CONFIG["MOZ_DEBUG"]: +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" +- DEFINES["NDEBUG"] = True +- DEFINES["NVALGRIND"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1": +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["CPU_ARCH"] == "aarch64": +- +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["CPU_ARCH"] == "x86": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "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 3a495f5b6ca0..000000000000 +--- third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build ++++ /dev/null +@@ -1,84 +0,0 @@ +-# This Source Code Form is subject to the terms of the Mozilla Public +-# License, v. 2.0. If a copy of the MPL was not distributed with this +-# file, You can obtain one at http://mozilla.org/MPL/2.0/. +- +- +- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### +- ### DO NOT edit it by hand. ### +- +-COMPILE_FLAGS["OS_INCLUDES"] = [] +-AllowCompilerWarnings() +- +-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +-DEFINES["NOMINMAX"] = True +-DEFINES["NTDDI_VERSION"] = "0x0A000000" +-DEFINES["PSAPI_VERSION"] = "2" +-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True +-DEFINES["RTC_ENABLE_VP9"] = True +-DEFINES["UNICODE"] = True +-DEFINES["USE_AURA"] = "1" +-DEFINES["WEBRTC_ENABLE_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_RAND_S"] = True +-DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +-DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +-DEFINES["_HAS_EXCEPTIONS"] = "0" +-DEFINES["_HAS_NODISCARD"] = True +-DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +-DEFINES["_SECURE_ATL"] = True +-DEFINES["_UNICODE"] = True +-DEFINES["_WIN32_WINNT"] = "0x0A00" +-DEFINES["_WINDOWS"] = True +-DEFINES["__STD_C"] = True +- +-FINAL_LIBRARY = "webrtc" +- +- +-LOCAL_INCLUDES += [ +- "!/ipc/ipdl/_ipdlheaders", +- "!/third_party/libwebrtc/gen", +- "/ipc/chromium/src", +- "/third_party/libwebrtc/", +- "/third_party/libwebrtc/third_party/abseil-cpp/", +- "/tools/profiler/public" +-] +- +-SOURCES += [ +- "/third_party/libwebrtc/rtc_base/win/hstring.cc" +-] +- +-if not CONFIG["MOZ_DEBUG"]: +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" +- DEFINES["NDEBUG"] = True +- DEFINES["NVALGRIND"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1": +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["CPU_ARCH"] == "aarch64": +- +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["CPU_ARCH"] == "x86": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "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 88dc67ea4893..000000000000 +--- third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build ++++ /dev/null +@@ -1,84 +0,0 @@ +-# This Source Code Form is subject to the terms of the Mozilla Public +-# License, v. 2.0. If a copy of the MPL was not distributed with this +-# file, You can obtain one at http://mozilla.org/MPL/2.0/. +- +- +- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### +- ### DO NOT edit it by hand. ### +- +-COMPILE_FLAGS["OS_INCLUDES"] = [] +-AllowCompilerWarnings() +- +-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +-DEFINES["NOMINMAX"] = True +-DEFINES["NTDDI_VERSION"] = "0x0A000000" +-DEFINES["PSAPI_VERSION"] = "2" +-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True +-DEFINES["RTC_ENABLE_VP9"] = True +-DEFINES["UNICODE"] = True +-DEFINES["USE_AURA"] = "1" +-DEFINES["WEBRTC_ENABLE_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_RAND_S"] = True +-DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +-DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +-DEFINES["_HAS_EXCEPTIONS"] = "0" +-DEFINES["_HAS_NODISCARD"] = True +-DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +-DEFINES["_SECURE_ATL"] = True +-DEFINES["_UNICODE"] = True +-DEFINES["_WIN32_WINNT"] = "0x0A00" +-DEFINES["_WINDOWS"] = True +-DEFINES["__STD_C"] = True +- +-FINAL_LIBRARY = "webrtc" +- +- +-LOCAL_INCLUDES += [ +- "!/ipc/ipdl/_ipdlheaders", +- "!/third_party/libwebrtc/gen", +- "/ipc/chromium/src", +- "/third_party/libwebrtc/", +- "/third_party/libwebrtc/third_party/abseil-cpp/", +- "/tools/profiler/public" +-] +- +-UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/rtc_base/win/windows_version.cc" +-] +- +-if not CONFIG["MOZ_DEBUG"]: +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" +- DEFINES["NDEBUG"] = True +- DEFINES["NVALGRIND"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1": +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["CPU_ARCH"] == "aarch64": +- +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["CPU_ARCH"] == "x86": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "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 656bd4014be6..000000000000 +--- third_party/libwebrtc/rtc_base/win32_gn/moz.build ++++ /dev/null +@@ -1,93 +0,0 @@ +-# This Source Code Form is subject to the terms of the Mozilla Public +-# License, v. 2.0. If a copy of the MPL was not distributed with this +-# file, You can obtain one at http://mozilla.org/MPL/2.0/. +- +- +- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### +- ### DO NOT edit it by hand. ### +- +-COMPILE_FLAGS["OS_INCLUDES"] = [] +-AllowCompilerWarnings() +- +-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +-DEFINES["NOMINMAX"] = True +-DEFINES["NTDDI_VERSION"] = "0x0A000000" +-DEFINES["PSAPI_VERSION"] = "2" +-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True +-DEFINES["RTC_ENABLE_VP9"] = True +-DEFINES["UNICODE"] = True +-DEFINES["USE_AURA"] = "1" +-DEFINES["WEBRTC_ENABLE_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_DEPRECATE"] = True +-DEFINES["_CRT_RAND_S"] = True +-DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +-DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +-DEFINES["_HAS_EXCEPTIONS"] = "0" +-DEFINES["_HAS_NODISCARD"] = True +-DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +-DEFINES["_SECURE_ATL"] = True +-DEFINES["_UNICODE"] = True +-DEFINES["_WIN32_WINNT"] = "0x0A00" +-DEFINES["_WINDOWS"] = True +-DEFINES["__STD_C"] = True +- +-FINAL_LIBRARY = "webrtc" +- +- +-LOCAL_INCLUDES += [ +- "!/ipc/ipdl/_ipdlheaders", +- "!/third_party/libwebrtc/gen", +- "/ipc/chromium/src", +- "/third_party/libwebrtc/", +- "/third_party/libwebrtc/third_party/abseil-cpp/", +- "/tools/profiler/public" +-] +- +-OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +-] +- +-UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/rtc_base/win32.cc", +- "/third_party/libwebrtc/rtc_base/win32_window.cc" +-] +- +-if not CONFIG["MOZ_DEBUG"]: +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" +- DEFINES["NDEBUG"] = True +- DEFINES["NVALGRIND"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1": +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["CPU_ARCH"] == "aarch64": +- +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["CPU_ARCH"] == "x86": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "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 b186530b19c6..eaf3581aaff9 100644 +--- third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build ++++ third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -61063,7 +85590,7 @@ index 45b4ce477f94..9c964e79f915 100644 FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -61071,7 +85598,7 @@ index 45b4ce477f94..9c964e79f915 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -61112,6 +85639,7 @@ index 45b4ce477f94..9c964e79f915 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -61162,6 +85690,24 @@ index 45b4ce477f94..9c964e79f915 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -61195,8 +85741,7 @@ index 45b4ce477f94..9c964e79f915 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -61214,34 +85759,361 @@ index 45b4ce477f94..9c964e79f915 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("sequence_checker_gn") -diff --git third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build -index 5cc41102ca63..9bc9bed9472c 100644 ---- third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build -+++ third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + 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 976c7fceb752..000000000000 +--- third_party/libwebrtc/sdk/base_objc_gn/moz.build ++++ /dev/null +@@ -1,79 +0,0 @@ +-# This Source Code Form is subject to the terms of the Mozilla Public +-# License, v. 2.0. If a copy of the MPL was not distributed with this +-# file, You can obtain one at http://mozilla.org/MPL/2.0/. +- +- +- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### +- ### DO NOT edit it by hand. ### +- +-CMFLAGS += [ +- "-fobjc-arc" +-] +- +-CMMFLAGS += [ +- "-fobjc-arc" +-] +- +-COMPILE_FLAGS["OS_INCLUDES"] = [] +-AllowCompilerWarnings() +- +-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True +-DEFINES["RTC_ENABLE_VP9"] = True +-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" +-DEFINES["WEBRTC_LIBRARY_IMPL"] = True +-DEFINES["WEBRTC_MAC"] = True +-DEFINES["WEBRTC_MOZILLA_BUILD"] = True +-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +-DEFINES["WEBRTC_POSIX"] = True +-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +-DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +-DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +-DEFINES["__STDC_CONSTANT_MACROS"] = True +-DEFINES["__STDC_FORMAT_MACROS"] = True +- +-FINAL_LIBRARY = "webrtc" +- +- +-LOCAL_INCLUDES += [ +- "!/ipc/ipdl/_ipdlheaders", +- "!/third_party/libwebrtc/gen", +- "/ipc/chromium/src", +- "/third_party/libwebrtc/", +- "/third_party/libwebrtc/sdk/objc/", +- "/third_party/libwebrtc/sdk/objc/base/", +- "/third_party/libwebrtc/third_party/abseil-cpp/", +- "/tools/profiler/public" +-] +- +-UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/sdk/objc/base/RTCEncodedImage.m", +- "/third_party/libwebrtc/sdk/objc/base/RTCLogging.mm", +- "/third_party/libwebrtc/sdk/objc/base/RTCVideoCapturer.m", +- "/third_party/libwebrtc/sdk/objc/base/RTCVideoCodecInfo.m", +- "/third_party/libwebrtc/sdk/objc/base/RTCVideoEncoderQpThresholds.m", +- "/third_party/libwebrtc/sdk/objc/base/RTCVideoEncoderSettings.m", +- "/third_party/libwebrtc/sdk/objc/base/RTCVideoFrame.mm" +-] +- +-if not CONFIG["MOZ_DEBUG"]: +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" +- DEFINES["NDEBUG"] = True +- DEFINES["NVALGRIND"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1": +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- DEFINES["_DEBUG"] = True +- +-if CONFIG["CPU_ARCH"] == "aarch64": +- +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["CPU_ARCH"] == "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 7634e1aa7bb0..000000000000 +--- third_party/libwebrtc/sdk/helpers_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. ### +- +-CMFLAGS += [ +- "-fobjc-arc" +-] +- +-CMMFLAGS += [ +- "-fobjc-arc" +-] +- +-COMPILE_FLAGS["OS_INCLUDES"] = [] +-AllowCompilerWarnings() +- +-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True +-DEFINES["RTC_ENABLE_VP9"] = True +-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" +-DEFINES["WEBRTC_LIBRARY_IMPL"] = True +-DEFINES["WEBRTC_MAC"] = True +-DEFINES["WEBRTC_MOZILLA_BUILD"] = True +-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +-DEFINES["WEBRTC_POSIX"] = True +-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +-DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +-DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +-DEFINES["__STDC_CONSTANT_MACROS"] = True +-DEFINES["__STDC_FORMAT_MACROS"] = True +- +-FINAL_LIBRARY = "webrtc" +- +- +-LOCAL_INCLUDES += [ +- "!/ipc/ipdl/_ipdlheaders", +- "!/third_party/libwebrtc/gen", +- "/ipc/chromium/src", +- "/third_party/libwebrtc/", +- "/third_party/libwebrtc/sdk/objc/", +- "/third_party/libwebrtc/sdk/objc/base/", +- "/third_party/libwebrtc/third_party/abseil-cpp/", +- "/tools/profiler/public" +-] +- +-UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/sdk/objc/helpers/AVCaptureSession+DevicePosition.mm", +- "/third_party/libwebrtc/sdk/objc/helpers/NSString+StdString.mm", +- "/third_party/libwebrtc/sdk/objc/helpers/RTCDispatcher.m" +-] +- +-if not CONFIG["MOZ_DEBUG"]: +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" +- DEFINES["NDEBUG"] = True +- DEFINES["NVALGRIND"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1": +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- DEFINES["_DEBUG"] = True +- +-if CONFIG["CPU_ARCH"] == "aarch64": +- +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["CPU_ARCH"] == "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 64a7dbcb6366..000000000000 +--- third_party/libwebrtc/sdk/videocapture_objc_gn/moz.build ++++ /dev/null +@@ -1,70 +0,0 @@ +-# This Source Code Form is subject to the terms of the Mozilla Public +-# License, v. 2.0. If a copy of the MPL was not distributed with this +-# file, You can obtain one at http://mozilla.org/MPL/2.0/. +- +- +- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### +- ### DO NOT edit it by hand. ### +- +-CMFLAGS += [ +- "-fobjc-arc" +-] +- +-COMPILE_FLAGS["OS_INCLUDES"] = [] +-AllowCompilerWarnings() +- +-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True +-DEFINES["RTC_ENABLE_VP9"] = True +-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" +-DEFINES["WEBRTC_LIBRARY_IMPL"] = True +-DEFINES["WEBRTC_MAC"] = True +-DEFINES["WEBRTC_MOZILLA_BUILD"] = True +-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +-DEFINES["WEBRTC_POSIX"] = True +-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +-DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +-DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +-DEFINES["__STDC_CONSTANT_MACROS"] = True +-DEFINES["__STDC_FORMAT_MACROS"] = True +- +-FINAL_LIBRARY = "webrtc" +- +- +-LOCAL_INCLUDES += [ +- "!/ipc/ipdl/_ipdlheaders", +- "!/third_party/libwebrtc/gen", +- "/ipc/chromium/src", +- "/third_party/libwebrtc/", +- "/third_party/libwebrtc/sdk/objc/", +- "/third_party/libwebrtc/sdk/objc/base/", +- "/third_party/libwebrtc/third_party/abseil-cpp/", +- "/tools/profiler/public" +-] +- +-UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/sdk/objc/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["CPU_ARCH"] == "aarch64": +- +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["CPU_ARCH"] == "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 dea03fa57466..000000000000 +--- third_party/libwebrtc/sdk/videoframebuffer_objc_gn/moz.build ++++ /dev/null +@@ -1,73 +0,0 @@ +-# This Source Code Form is subject to the terms of the Mozilla Public +-# License, v. 2.0. If a copy of the MPL was not distributed with this +-# file, You can obtain one at http://mozilla.org/MPL/2.0/. +- +- +- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### +- ### DO NOT edit it by hand. ### +- +-CMMFLAGS += [ +- "-fobjc-arc" +-] +- +-COMPILE_FLAGS["OS_INCLUDES"] = [] +-AllowCompilerWarnings() +- +-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True +-DEFINES["RTC_ENABLE_VP9"] = True +-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" +-DEFINES["WEBRTC_LIBRARY_IMPL"] = True +-DEFINES["WEBRTC_MAC"] = True +-DEFINES["WEBRTC_MOZILLA_BUILD"] = True +-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +-DEFINES["WEBRTC_POSIX"] = True +-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +-DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +-DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +-DEFINES["__STDC_CONSTANT_MACROS"] = True +-DEFINES["__STDC_FORMAT_MACROS"] = True +- +-FINAL_LIBRARY = "webrtc" +- +- +-LOCAL_INCLUDES += [ +- "!/ipc/ipdl/_ipdlheaders", +- "!/third_party/libwebrtc/gen", +- "/ipc/chromium/src", +- "/media/libyuv/", +- "/media/libyuv/libyuv/include/", +- "/third_party/libwebrtc/", +- "/third_party/libwebrtc/sdk/objc/", +- "/third_party/libwebrtc/sdk/objc/base/", +- "/third_party/libwebrtc/third_party/abseil-cpp/", +- "/tools/profiler/public" +-] +- +-UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/sdk/objc/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["CPU_ARCH"] == "aarch64": +- +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-Library("videoframebuffer_objc_gn") +diff --git third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build +index 10482ec2ea89..064ddd6f7ea0 100644 +--- third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build ++++ third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -61250,7 +86122,7 @@ index 5cc41102ca63..9bc9bed9472c 100644 FINAL_LIBRARY = "webrtc" -@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -61258,7 +86130,7 @@ index 5cc41102ca63..9bc9bed9472c 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -61268,6 +86140,10 @@ index 5cc41102ca63..9bc9bed9472c 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -61295,6 +86171,7 @@ index 5cc41102ca63..9bc9bed9472c 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -61345,6 +86222,24 @@ index 5cc41102ca63..9bc9bed9472c 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -61379,10 +86274,10 @@ index 5cc41102ca63..9bc9bed9472c 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -61396,35 +86291,40 @@ index 5cc41102ca63..9bc9bed9472c 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("yield_gn") -diff --git third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build -index 5db0a535e612..505db352b5af 100644 ---- third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build -+++ third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("denormal_disabler_gn") +diff --git third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build +index 9bbb11725944..53f2c83c65cc 100644 +--- third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build ++++ third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -61433,7 +86333,7 @@ index 5db0a535e612..505db352b5af 100644 FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -61441,7 +86341,7 @@ index 5db0a535e612..505db352b5af 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -61482,6 +86382,7 @@ index 5db0a535e612..505db352b5af 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -61516,6 +86417,10 @@ index 5db0a535e612..505db352b5af 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -61533,184 +86438,23 @@ index 5db0a535e612..505db352b5af 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" -- --if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] + if CONFIG["CPU_ARCH"] == "mips32": -- OS_LIBS += [ -- "android_support" -- ] -- --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": -- + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["CPU_ARCH"] == "mips64": - - DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- -- CXXFLAGS += [ -- "-msse2" -- ] -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- - Library("yield_policy_gn") -diff --git third_party/libwebrtc/rtc_base/system/arch_gn/moz.build third_party/libwebrtc/rtc_base/system/arch_gn/moz.build -index 37d5eb9f295f..d9d2596f4fb8 100644 ---- third_party/libwebrtc/rtc_base/system/arch_gn/moz.build -+++ third_party/libwebrtc/rtc_base/system/arch_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True -+DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["_FILE_OFFSET_BITS"] = "64" -+DEFINES["_LARGEFILE64_SOURCE"] = True -+DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True - FINAL_LIBRARY = "webrtc" - -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: - if CONFIG["MOZ_DEBUG"] == "1": + if CONFIG["CPU_ARCH"] == "x86": - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" -- --if CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" -- DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True -- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_AURA"] = "1" -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_NSS_CERTS"] = "1" -- DEFINES["USE_OZONE"] = "1" -- DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "OpenBSD": +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True -- DEFINES["NOMINMAX"] = True -- DEFINES["NTDDI_VERSION"] = "0x0A000000" -- DEFINES["PSAPI_VERSION"] = "2" -- DEFINES["UNICODE"] = True -- DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True -- DEFINES["WIN32"] = True -- DEFINES["WIN32_LEAN_AND_MEAN"] = True -- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" -- DEFINES["WINVER"] = "0x0A00" -- DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_RAND_S"] = True -- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True -- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True -- DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True -- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True -- DEFINES["_SECURE_ATL"] = True -- DEFINES["_UNICODE"] = True -- DEFINES["_WIN32_WINNT"] = "0x0A00" -- DEFINES["_WINDOWS"] = True -- DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": +-if CONFIG["CPU_ARCH"] == "x86_64": - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -61745,6 +86489,10 @@ index 37d5eb9f295f..d9d2596f4fb8 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -61758,30 +86506,40 @@ index 37d5eb9f295f..d9d2596f4fb8 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("arch_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 37fc7cfc1659..6fc25ea08ead 100644 ---- third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build -+++ third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("field_trial_gn") +diff --git third_party/libwebrtc/system_wrappers/metrics_gn/moz.build third_party/libwebrtc/system_wrappers/metrics_gn/moz.build +index b4982671c9fb..a5e24c852a0d 100644 +--- third_party/libwebrtc/system_wrappers/metrics_gn/moz.build ++++ third_party/libwebrtc/system_wrappers/metrics_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -61790,7 +86548,7 @@ index 37fc7cfc1659..6fc25ea08ead 100644 FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -61798,7 +86556,7 @@ index 37fc7cfc1659..6fc25ea08ead 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -61839,6 +86597,7 @@ index 37fc7cfc1659..6fc25ea08ead 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -61889,6 +86648,24 @@ index 37fc7cfc1659..6fc25ea08ead 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -61922,8 +86699,7 @@ index 37fc7cfc1659..6fc25ea08ead 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -61941,34 +86717,40 @@ index 37fc7cfc1659..6fc25ea08ead 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("file_wrapper_gn") -diff --git third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build -index 4ccf3744cb41..60dd57a72036 100644 ---- third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build -+++ third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("metrics_gn") +diff --git third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build +index bfc6aa12f922..2c316fbc9e0f 100644 +--- third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build ++++ third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -61977,7 +86759,7 @@ index 4ccf3744cb41..60dd57a72036 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -47,200 +56,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -61985,7 +86767,7 @@ index 4ccf3744cb41..60dd57a72036 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -61995,6 +86777,16 @@ index 4ccf3744cb41..60dd57a72036 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- LOCAL_INCLUDES += [ +- "/config/external/nspr/", +- "/nsprpub/lib/ds/", +- "/nsprpub/pr/include/" +- ] +- +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -62019,9 +86811,18 @@ index 4ccf3744cb41..60dd57a72036 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/system_wrappers/source/cpu_features_linux.cc" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -62056,6 +86857,13 @@ index 4ccf3744cb41..60dd57a72036 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -62065,9 +86873,31 @@ index 4ccf3744cb41..60dd57a72036 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -62102,6 +86932,10 @@ index 4ccf3744cb41..60dd57a72036 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -62115,30 +86949,40 @@ index 4ccf3744cb41..60dd57a72036 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 6632c7c906bd..edc16b5cea28 100644 ---- third_party/libwebrtc/rtc_base/system/inline_gn/moz.build -+++ third_party/libwebrtc/rtc_base/system/inline_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + 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 25bb2ee0a16a..c15a9ae02722 100644 +--- third_party/libwebrtc/test/rtp_test_utils_gn/moz.build ++++ third_party/libwebrtc/test/rtp_test_utils_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -62147,7 +86991,7 @@ index 6632c7c906bd..edc16b5cea28 100644 FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -62155,7 +86999,7 @@ index 6632c7c906bd..edc16b5cea28 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -62165,6 +87009,10 @@ index 6632c7c906bd..edc16b5cea28 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -62189,9 +87037,14 @@ index 6632c7c906bd..edc16b5cea28 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -62226,6 +87079,13 @@ index 6632c7c906bd..edc16b5cea28 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -62239,6 +87099,22 @@ index 6632c7c906bd..edc16b5cea28 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -62260,9 +87136,10 @@ index 6632c7c906bd..edc16b5cea28 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -62292,32 +87169,24 @@ index 6632c7c906bd..edc16b5cea28 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("inline_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 2b01a6c41327..7de80905a1b7 100644 ---- third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build -+++ third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() + Library("rtp_test_utils_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build +index 31acde4e32f6..a07cf094c60f 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build +@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] + AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -62325,24 +87194,14 @@ index 2b01a6c41327..7de80905a1b7 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -62351,25 +87210,18 @@ index 2b01a6c41327..7de80905a1b7 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -62379,35 +87231,31 @@ index 2b01a6c41327..7de80905a1b7 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True +- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -62415,8 +87263,8 @@ index 2b01a6c41327..7de80905a1b7 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -62430,9 +87278,10 @@ index 2b01a6c41327..7de80905a1b7 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -62462,32 +87311,24 @@ index 2b01a6c41327..7de80905a1b7 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("rtc_export_gn") -diff --git third_party/libwebrtc/rtc_base/system/thread_registry_gn/moz.build third_party/libwebrtc/rtc_base/system/thread_registry_gn/moz.build -index b8ef888289a7..63c0fb778203 100644 ---- third_party/libwebrtc/rtc_base/system/thread_registry_gn/moz.build -+++ third_party/libwebrtc/rtc_base/system/thread_registry_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() + Library("algorithm_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build +index ca1f9f85bf02..ea98e82e69b0 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build +@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] + AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -62495,28 +87336,14 @@ index b8ef888289a7..63c0fb778203 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- -- OS_LIBS += [ -- "log" -- ] - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -62525,25 +87352,18 @@ index b8ef888289a7..63c0fb778203 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -62553,17 +87373,17 @@ index b8ef888289a7..63c0fb778203 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True +- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True @@ -62571,21 +87391,13 @@ index b8ef888289a7..63c0fb778203 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - -- OS_LIBS += [ -- "winmm" -- ] -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": +-if CONFIG["CPU_ARCH"] == "mips32": - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -62593,8 +87405,8 @@ index b8ef888289a7..63c0fb778203 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -62608,9 +87420,10 @@ index b8ef888289a7..63c0fb778203 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -62640,32 +87453,24 @@ index b8ef888289a7..63c0fb778203 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("thread_registry_gn") -diff --git third_party/libwebrtc/rtc_base/system/unused_gn/moz.build third_party/libwebrtc/rtc_base/system/unused_gn/moz.build -index 5509ed80f3eb..e43825679798 100644 ---- third_party/libwebrtc/rtc_base/system/unused_gn/moz.build -+++ third_party/libwebrtc/rtc_base/system/unused_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() + Library("container_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build +index 5b1e4a8e0ac3..49c783cd4c81 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build +@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] + AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -62673,24 +87478,14 @@ index 5509ed80f3eb..e43825679798 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -62699,25 +87494,18 @@ index 5509ed80f3eb..e43825679798 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -62727,35 +87515,31 @@ index 5509ed80f3eb..e43825679798 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True +- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -62763,8 +87547,8 @@ index 5509ed80f3eb..e43825679798 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -62778,9 +87562,10 @@ index 5509ed80f3eb..e43825679798 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -62810,32 +87595,24 @@ index 5509ed80f3eb..e43825679798 100644 - - 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 79be38a5fcea..cda637ed1b4b 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() + Library("atomic_hook_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build +index e21dd2812a91..ac7916a85e5d 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build +@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] + AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -62843,24 +87620,14 @@ index 79be38a5fcea..cda637ed1b4b 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -62869,25 +87636,18 @@ index 79be38a5fcea..cda637ed1b4b 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -62897,35 +87657,31 @@ index 79be38a5fcea..cda637ed1b4b 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True +- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -62933,8 +87689,8 @@ index 79be38a5fcea..cda637ed1b4b 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -62948,9 +87704,10 @@ index 79be38a5fcea..cda637ed1b4b 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -62980,32 +87737,24 @@ index 79be38a5fcea..cda637ed1b4b 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("warn_current_thread_is_deadlocked_gn") -diff --git third_party/libwebrtc/rtc_base/task_utils/pending_task_safety_flag_gn/moz.build third_party/libwebrtc/rtc_base/task_utils/pending_task_safety_flag_gn/moz.build -index ad1b375c0b0d..37428808cbc0 100644 ---- third_party/libwebrtc/rtc_base/task_utils/pending_task_safety_flag_gn/moz.build -+++ third_party/libwebrtc/rtc_base/task_utils/pending_task_safety_flag_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() + Library("base_internal_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build +index d226f5a9e03c..a1d553dad6db 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build +@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] + AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -63013,28 +87762,14 @@ index ad1b375c0b0d..37428808cbc0 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- -- OS_LIBS += [ -- "log" -- ] - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -63043,25 +87778,18 @@ index ad1b375c0b0d..37428808cbc0 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -63071,39 +87799,31 @@ index ad1b375c0b0d..37428808cbc0 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True +- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] +-if CONFIG["CPU_ARCH"] == "mips32": - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -63111,8 +87831,8 @@ index ad1b375c0b0d..37428808cbc0 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -63126,9 +87846,10 @@ index ad1b375c0b0d..37428808cbc0 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -63137,12 +87858,7 @@ index ad1b375c0b0d..37428808cbc0 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -63157,42 +87873,30 @@ index ad1b375c0b0d..37428808cbc0 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("pending_task_safety_flag_gn") -diff --git third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build -index 6f2570a95f09..d0817cac95aa 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() + Library("config_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build +index 9bb661c458d7..3e445069597d 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build +@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] + AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -63200,28 +87904,14 @@ index 6f2570a95f09..d0817cac95aa 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- -- OS_LIBS += [ -- "log" -- ] - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -63230,29 +87920,18 @@ index 6f2570a95f09..d0817cac95aa 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- -- OS_LIBS += [ -- "rt" -- ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -63262,17 +87941,17 @@ index 6f2570a95f09..d0817cac95aa 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True +- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True @@ -63280,28 +87959,13 @@ index 6f2570a95f09..d0817cac95aa 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": +-if CONFIG["CPU_ARCH"] == "mips32": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] +- DEFINES["_GNU_SOURCE"] = True - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -63309,8 +87973,8 @@ index 6f2570a95f09..d0817cac95aa 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -63324,9 +87988,10 @@ index 6f2570a95f09..d0817cac95aa 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -63335,12 +88000,7 @@ index 6f2570a95f09..d0817cac95aa 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -63351,13 +88011,9 @@ index 6f2570a95f09..d0817cac95aa 100644 - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- -- CXXFLAGS += [ -- "-msse2" -- ] +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - @@ -63365,32 +88021,24 @@ index 6f2570a95f09..d0817cac95aa 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("repeating_task_gn") -diff --git third_party/libwebrtc/rtc_base/task_utils/to_queued_task_gn/moz.build third_party/libwebrtc/rtc_base/task_utils/to_queued_task_gn/moz.build -index 3303f5bb5949..2f3734d0d080 100644 ---- third_party/libwebrtc/rtc_base/task_utils/to_queued_task_gn/moz.build -+++ third_party/libwebrtc/rtc_base/task_utils/to_queued_task_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() + Library("core_headers_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build +index a237d04bb798..edd5959dc1b8 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build +@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] + AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -36,138 +41,16 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -63398,28 +88046,14 @@ index 3303f5bb5949..2f3734d0d080 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- -- OS_LIBS += [ -- "log" -- ] - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -63428,25 +88062,18 @@ index 3303f5bb5949..2f3734d0d080 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -63456,35 +88083,37 @@ index 3303f5bb5949..2f3734d0d080 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True +- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - +- -if CONFIG["CPU_ARCH"] == "arm": - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -63496,8 +88125,8 @@ index 3303f5bb5949..2f3734d0d080 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -63519,6 +88148,10 @@ index 3303f5bb5949..2f3734d0d080 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - +- CXXFLAGS += [ +- "-msse2" +- ] +- - OS_LIBS += [ - "android_support" - ] @@ -63532,39 +88165,38 @@ index 3303f5bb5949..2f3734d0d080 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["CPU_ARCH"] == "x86": + + CXXFLAGS += [ + "-msse2" + ] + - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("to_queued_task_gn") -diff --git third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build -index fe1886165d68..600f30c98b75 100644 ---- third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build -+++ third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + + Library("log_severity_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build +index 8be2f4c300d7..f55dd72d008a 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build +@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] + AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -36,138 +41,16 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -63572,24 +88204,14 @@ index fe1886165d68..600f30c98b75 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -63598,25 +88220,18 @@ index fe1886165d68..600f30c98b75 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -63626,39 +88241,37 @@ index fe1886165d68..600f30c98b75 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True +- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - +- -if CONFIG["CPU_ARCH"] == "arm": - - CXXFLAGS += [ - "-mfpu=neon" - ] - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -63670,8 +88283,8 @@ index fe1886165d68..600f30c98b75 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -63719,35 +88332,29 @@ index fe1886165d68..600f30c98b75 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("base64_gn") -diff --git third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build -index 8b527fdfbe54..ac5990efe31c 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 -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + + Library("raw_logging_internal_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/throw_delegate_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/throw_delegate_gn/moz.build +index 813eed764791..bc411d424827 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/throw_delegate_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/throw_delegate_gn/moz.build +@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] + AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -36,138 +41,16 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -63755,24 +88362,14 @@ index 8b527fdfbe54..ac5990efe31c 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -63781,25 +88378,18 @@ index 8b527fdfbe54..ac5990efe31c 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -63809,39 +88399,37 @@ index 8b527fdfbe54..ac5990efe31c 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True +- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - +- -if CONFIG["CPU_ARCH"] == "arm": - - CXXFLAGS += [ - "-mfpu=neon" - ] - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -63853,8 +88441,8 @@ index 8b527fdfbe54..ac5990efe31c 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -63902,35 +88490,29 @@ index 8b527fdfbe54..ac5990efe31c 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("sigslot_gn") -diff --git third_party/libwebrtc/rtc_base/thread_checker_gn/moz.build third_party/libwebrtc/rtc_base/thread_checker_gn/moz.build -index 2469b6d79c69..f2b11da26cd9 100644 ---- third_party/libwebrtc/rtc_base/thread_checker_gn/moz.build -+++ third_party/libwebrtc/rtc_base/thread_checker_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + + Library("throw_delegate_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build +index 6cd0d6b473dd..367c6bd433a3 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build +@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] + AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -63938,28 +88520,14 @@ index 2469b6d79c69..f2b11da26cd9 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- -- OS_LIBS += [ -- "log" -- ] - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -63968,25 +88536,18 @@ index 2469b6d79c69..f2b11da26cd9 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -63996,35 +88557,31 @@ index 2469b6d79c69..f2b11da26cd9 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True +- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -64032,8 +88589,8 @@ index 2469b6d79c69..f2b11da26cd9 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -64047,9 +88604,10 @@ index 2469b6d79c69..f2b11da26cd9 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -64079,32 +88637,24 @@ index 2469b6d79c69..f2b11da26cd9 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("thread_checker_gn") -diff --git third_party/libwebrtc/rtc_base/time/timestamp_extrapolator_gn/moz.build third_party/libwebrtc/rtc_base/time/timestamp_extrapolator_gn/moz.build -index 27bf23bfc704..7609b873b4e3 100644 ---- third_party/libwebrtc/rtc_base/time/timestamp_extrapolator_gn/moz.build -+++ third_party/libwebrtc/rtc_base/time/timestamp_extrapolator_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() + Library("cleanup_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build +index b0fd90e5e1aa..3f4fc9ed0f88 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build +@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] + AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -64112,24 +88662,14 @@ index 27bf23bfc704..7609b873b4e3 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -64138,25 +88678,18 @@ index 27bf23bfc704..7609b873b4e3 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -64166,17 +88699,17 @@ index 27bf23bfc704..7609b873b4e3 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True +- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True @@ -64184,25 +88717,13 @@ index 27bf23bfc704..7609b873b4e3 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - -- OS_LIBS += [ -- "winmm" -- ] -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": +-if CONFIG["CPU_ARCH"] == "mips32": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] +- DEFINES["_GNU_SOURCE"] = True - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -64210,8 +88731,8 @@ index 27bf23bfc704..7609b873b4e3 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -64225,9 +88746,10 @@ index 27bf23bfc704..7609b873b4e3 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -64236,12 +88758,7 @@ index 27bf23bfc704..7609b873b4e3 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -64256,43 +88773,30 @@ index 27bf23bfc704..7609b873b4e3 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("timestamp_extrapolator_gn") -diff --git third_party/libwebrtc/rtc_base/timeutils_gn/moz.build third_party/libwebrtc/rtc_base/timeutils_gn/moz.build -index b82a9e574f7a..d8ebfee4b28f 100644 ---- third_party/libwebrtc/rtc_base/timeutils_gn/moz.build -+++ third_party/libwebrtc/rtc_base/timeutils_gn/moz.build -@@ -11,11 +11,20 @@ AllowCompilerWarnings() + Library("cleanup_internal_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build +index 29587550a341..38403c4daf5f 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build +@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] + AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" -+DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" - DEFINES["WEBRTC_EXCLUDE_SYSTEM_TIME"] = True - DEFINES["WEBRTC_LIBRARY_IMPL"] = True - DEFINES["WEBRTC_MOZILLA_BUILD"] = True - DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" -+DEFINES["WEBRTC_POSIX"] = True ++DEFINES["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -42,164 +51,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -64300,28 +88804,14 @@ index b82a9e574f7a..d8ebfee4b28f 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- -- OS_LIBS += [ -- "log" -- ] - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -64330,25 +88820,18 @@ index b82a9e574f7a..d8ebfee4b28f 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -64358,17 +88841,17 @@ index b82a9e574f7a..d8ebfee4b28f 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True +- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True @@ -64376,25 +88859,13 @@ index b82a9e574f7a..d8ebfee4b28f 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - -- OS_LIBS += [ -- "winmm" -- ] -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": +-if CONFIG["CPU_ARCH"] == "mips32": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] +- DEFINES["_GNU_SOURCE"] = True - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -64402,8 +88873,8 @@ index b82a9e574f7a..d8ebfee4b28f 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -64417,9 +88888,10 @@ index b82a9e574f7a..d8ebfee4b28f 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -64429,10 +88901,6 @@ index b82a9e574f7a..d8ebfee4b28f 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -64446,44 +88914,31 @@ index b82a9e574f7a..d8ebfee4b28f 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("timeutils_gn") -diff --git third_party/libwebrtc/rtc_base/type_traits_gn/moz.build third_party/libwebrtc/rtc_base/type_traits_gn/moz.build -index 7a7f9ecb0a88..fb9c6beac4ce 100644 ---- third_party/libwebrtc/rtc_base/type_traits_gn/moz.build -+++ third_party/libwebrtc/rtc_base/type_traits_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() + Library("compressed_tuple_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build +index 9cebdf041bf3..f3c3c2ec8183 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build +@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] + AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -64491,24 +88946,14 @@ index 7a7f9ecb0a88..fb9c6beac4ce 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -64517,25 +88962,18 @@ index 7a7f9ecb0a88..fb9c6beac4ce 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -64545,35 +88983,31 @@ index 7a7f9ecb0a88..fb9c6beac4ce 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True +- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -64581,8 +89015,8 @@ index 7a7f9ecb0a88..fb9c6beac4ce 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -64596,9 +89030,10 @@ index 7a7f9ecb0a88..fb9c6beac4ce 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -64628,32 +89063,24 @@ index 7a7f9ecb0a88..fb9c6beac4ce 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("type_traits_gn") -diff --git third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build -index c6e8a0edb162..11dfe34ae456 100644 ---- third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build -+++ third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() + Library("inlined_vector_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build +index 6bd470bb56b8..b5c250da1c55 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build +@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] + AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -64661,28 +89088,14 @@ index c6e8a0edb162..11dfe34ae456 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- -- OS_LIBS += [ -- "log" -- ] - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -64691,25 +89104,18 @@ index c6e8a0edb162..11dfe34ae456 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -64719,35 +89125,31 @@ index c6e8a0edb162..11dfe34ae456 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True +- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -64755,8 +89157,8 @@ index c6e8a0edb162..11dfe34ae456 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -64770,9 +89172,10 @@ index c6e8a0edb162..11dfe34ae456 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -64802,32 +89205,24 @@ index c6e8a0edb162..11dfe34ae456 100644 - - 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 0934a884cdfa..8331fbaf8cf0 100644 ---- third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build -+++ third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() + Library("inlined_vector_internal_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/functional/any_invocable_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/functional/any_invocable_gn/moz.build +index c71de94dba7d..8cc78181cb75 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/functional/any_invocable_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/functional/any_invocable_gn/moz.build +@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] + AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -64835,28 +89230,14 @@ index 0934a884cdfa..8331fbaf8cf0 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- -- OS_LIBS += [ -- "log" -- ] - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -64865,25 +89246,18 @@ index 0934a884cdfa..8331fbaf8cf0 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -64893,39 +89267,31 @@ index 0934a884cdfa..8331fbaf8cf0 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True +- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] +-if CONFIG["CPU_ARCH"] == "mips32": - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -64933,8 +89299,8 @@ index 0934a884cdfa..8331fbaf8cf0 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -64948,9 +89314,10 @@ index 0934a884cdfa..8331fbaf8cf0 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -64959,12 +89326,7 @@ index 0934a884cdfa..8331fbaf8cf0 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -64979,42 +89341,30 @@ index 0934a884cdfa..8331fbaf8cf0 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("weak_ptr_gn") -diff --git third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build -index a95460f990e5..e917884b17e1 100644 ---- third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build -+++ third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() + Library("any_invocable_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build +index 6844d6e45b13..5c92f038c84f 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build +@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] + AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -65022,28 +89372,14 @@ index a95460f990e5..e917884b17e1 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- -- OS_LIBS += [ -- "log" -- ] - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -65052,25 +89388,18 @@ index a95460f990e5..e917884b17e1 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -65080,17 +89409,17 @@ index a95460f990e5..e917884b17e1 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True +- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True @@ -65098,25 +89427,13 @@ index a95460f990e5..e917884b17e1 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - -- OS_LIBS += [ -- "winmm" -- ] -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": +-if CONFIG["CPU_ARCH"] == "mips32": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] +- DEFINES["_GNU_SOURCE"] = True - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -65124,8 +89441,8 @@ index a95460f990e5..e917884b17e1 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -65139,9 +89456,10 @@ index a95460f990e5..e917884b17e1 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -65151,10 +89469,6 @@ index a95460f990e5..e917884b17e1 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -65168,44 +89482,31 @@ index a95460f990e5..e917884b17e1 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("field_trial_gn") -diff --git third_party/libwebrtc/system_wrappers/metrics_gn/moz.build third_party/libwebrtc/system_wrappers/metrics_gn/moz.build -index 75e7b07f3e00..3d357294d83b 100644 ---- third_party/libwebrtc/system_wrappers/metrics_gn/moz.build -+++ third_party/libwebrtc/system_wrappers/metrics_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() + Library("bind_front_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build +index 092f878b8e82..cf5df0d3048a 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build +@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] + AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -65213,28 +89514,14 @@ index 75e7b07f3e00..3d357294d83b 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- -- OS_LIBS += [ -- "log" -- ] - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -65243,25 +89530,18 @@ index 75e7b07f3e00..3d357294d83b 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -65271,17 +89551,17 @@ index 75e7b07f3e00..3d357294d83b 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True +- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True @@ -65289,25 +89569,13 @@ index 75e7b07f3e00..3d357294d83b 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - -- OS_LIBS += [ -- "winmm" -- ] -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": +-if CONFIG["CPU_ARCH"] == "mips32": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] +- DEFINES["_GNU_SOURCE"] = True - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -65315,8 +89583,8 @@ index 75e7b07f3e00..3d357294d83b 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -65330,9 +89598,10 @@ index 75e7b07f3e00..3d357294d83b 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -65342,10 +89611,6 @@ index 75e7b07f3e00..3d357294d83b 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -65359,44 +89624,31 @@ index 75e7b07f3e00..3d357294d83b 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("metrics_gn") -diff --git third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build -index e5363ed34740..7e7eaba535a3 100644 ---- third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build -+++ third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() + Library("memory_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build +index ddb9d262175a..d7c6a3f7be95 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build +@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] + AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -44,181 +53,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -65404,34 +89656,14 @@ index e5363ed34740..7e7eaba535a3 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- -- LOCAL_INCLUDES += [ -- "/config/external/nspr/", -- "/nsprpub/lib/ds/", -- "/nsprpub/pr/include/" -- ] -- -- OS_LIBS += [ -- "log" -- ] - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -65440,33 +89672,18 @@ index e5363ed34740..7e7eaba535a3 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- -- OS_LIBS += [ -- "rt" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/system_wrappers/source/cpu_features_linux.cc" -- ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -65476,17 +89693,17 @@ index e5363ed34740..7e7eaba535a3 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True +- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True @@ -65494,28 +89711,13 @@ index e5363ed34740..7e7eaba535a3 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": +-if CONFIG["CPU_ARCH"] == "mips32": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] +- DEFINES["_GNU_SOURCE"] = True - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -65523,8 +89725,8 @@ index e5363ed34740..7e7eaba535a3 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -65538,9 +89740,10 @@ index e5363ed34740..7e7eaba535a3 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -65549,12 +89752,7 @@ index e5363ed34740..7e7eaba535a3 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -65569,42 +89767,30 @@ index e5363ed34740..7e7eaba535a3 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("system_wrappers_gn") -diff --git third_party/libwebrtc/test/rtp_test_utils_gn/moz.build third_party/libwebrtc/test/rtp_test_utils_gn/moz.build -index 137a0d97034a..7e85b073fc5e 100644 ---- third_party/libwebrtc/test/rtp_test_utils_gn/moz.build -+++ third_party/libwebrtc/test/rtp_test_utils_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() + Library("type_traits_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build +index 9c8d37ad517d..09fa161e8735 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build +@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] + AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -65612,29 +89798,14 @@ index 137a0d97034a..7e85b073fc5e 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- -- OS_LIBS += [ -- "GLESv2", -- "log" -- ] - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -65643,30 +89814,18 @@ index 137a0d97034a..7e85b073fc5e 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- -- OS_LIBS += [ -- "dl", -- "rt" -- ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -65676,17 +89835,17 @@ index 137a0d97034a..7e85b073fc5e 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True +- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True @@ -65694,28 +89853,13 @@ index 137a0d97034a..7e85b073fc5e 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": +-if CONFIG["CPU_ARCH"] == "mips32": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] +- DEFINES["_GNU_SOURCE"] = True - -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -65723,8 +89867,8 @@ index 137a0d97034a..7e85b073fc5e 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -65738,9 +89882,10 @@ index 137a0d97034a..7e85b073fc5e 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -65749,12 +89894,7 @@ index 137a0d97034a..7e85b073fc5e 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -65769,34 +89909,30 @@ index 137a0d97034a..7e85b073fc5e 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("rtp_test_utils_gn") -diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build -index 5fe12561bce8..d2fa12edf11c 100644 ---- third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build -+++ third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build + Library("bits_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build +index a15b4f43bbe4..0e364e67c4fc 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True FINAL_LIBRARY = "webrtc" -@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -36,138 +41,16 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -65804,7 +89940,7 @@ index 5fe12561bce8..d2fa12edf11c 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["_GNU_SOURCE"] = True - @@ -65827,6 +89963,7 @@ index 5fe12561bce8..d2fa12edf11c 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -65858,150 +89995,32 @@ index 5fe12561bce8..d2fa12edf11c 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- - DEFINES["_DEBUG"] = True - --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" -- --if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +-if CONFIG["CPU_ARCH"] == "arm": - -- OS_LIBS += [ -- "android_support" +- CXXFLAGS += [ +- "-mfpu=neon" - ] - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["CPU_ARCH"] == "mips32": - - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["CPU_ARCH"] == "mips64": - - DEFINES["_GNU_SOURCE"] = True -- - Library("algorithm_gn") -diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build -index 630af3526021..18d9ccea5cef 100644 ---- third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build -+++ third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build -@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] - AllowCompilerWarnings() - - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" -+DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" -+DEFINES["_FILE_OFFSET_BITS"] = "64" -+DEFINES["_LARGEFILE64_SOURCE"] = True -+DEFINES["_LARGEFILE_SOURCE"] = True - - FINAL_LIBRARY = "webrtc" - -@@ -31,115 +36,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"] = "r20_1" -- DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True -- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- --if CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_AURA"] = "1" -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_NSS_CERTS"] = "1" -- DEFINES["USE_OZONE"] = "1" -- DEFINES["USE_UDEV"] = True -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- --if CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_X11"] = "1" -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- --if CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True -- DEFINES["NOMINMAX"] = True -- DEFINES["NTDDI_VERSION"] = "0x0A000000" -- DEFINES["PSAPI_VERSION"] = "2" -- DEFINES["UNICODE"] = True -- DEFINES["USE_AURA"] = "1" -- DEFINES["WIN32"] = True -- DEFINES["WIN32_LEAN_AND_MEAN"] = True -- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" -- DEFINES["WINVER"] = "0x0A00" -- DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True -- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True -- DEFINES["_CRT_RAND_S"] = True -- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True -- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True -- DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True -- DEFINES["_SECURE_ATL"] = True -- DEFINES["_UNICODE"] = True -- DEFINES["_WIN32_WINNT"] = "0x0A00" -- DEFINES["_WINDOWS"] = True -- DEFINES["__STD_C"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- - DEFINES["_DEBUG"] = True - --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True - +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -66023,6 +90042,10 @@ index 630af3526021..18d9ccea5cef 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - +- CXXFLAGS += [ +- "-msse2" +- ] +- - OS_LIBS += [ - "android_support" - ] @@ -66036,31 +90059,38 @@ index 630af3526021..18d9ccea5cef 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["CPU_ARCH"] == "x86": + + CXXFLAGS += [ + "-msse2" + ] + - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("container_gn") -diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build -index 5faed87779ac..f47c187eeb30 100644 ---- third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build -+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build ++ DEFINES["USE_X11"] = "1" + + Library("int128_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build +index 2a53b9e647f7..71fd3a4a576d 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True FINAL_LIBRARY = "webrtc" -@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -40,138 +45,16 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -66068,7 +90098,7 @@ index 5faed87779ac..f47c187eeb30 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["_GNU_SOURCE"] = True - @@ -66091,6 +90121,7 @@ index 5faed87779ac..f47c187eeb30 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -66122,18 +90153,32 @@ index 5faed87779ac..f47c187eeb30 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "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"] == "Linux": +- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -66155,6 +90200,10 @@ index 5faed87779ac..f47c187eeb30 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - +- CXXFLAGS += [ +- "-msse2" +- ] +- - OS_LIBS += [ - "android_support" - ] @@ -66168,31 +90217,38 @@ index 5faed87779ac..f47c187eeb30 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["CPU_ARCH"] == "x86": + + CXXFLAGS += [ + "-msse2" + ] + - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("atomic_hook_gn") -diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build -index 039d5a2ca43d..3583851cc93c 100644 ---- third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build -+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build ++ DEFINES["USE_X11"] = "1" + + Library("strings_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build +index 3a88a0da486e..54aba92be8f6 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True FINAL_LIBRARY = "webrtc" -@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -36,138 +41,16 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -66200,7 +90256,7 @@ index 039d5a2ca43d..3583851cc93c 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["_GNU_SOURCE"] = True - @@ -66223,6 +90279,7 @@ index 039d5a2ca43d..3583851cc93c 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -66254,18 +90311,32 @@ index 039d5a2ca43d..3583851cc93c 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "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"] == "Linux": +- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -66287,6 +90358,10 @@ index 039d5a2ca43d..3583851cc93c 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - +- CXXFLAGS += [ +- "-msse2" +- ] +- - OS_LIBS += [ - "android_support" - ] @@ -66300,31 +90375,38 @@ index 039d5a2ca43d..3583851cc93c 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["CPU_ARCH"] == "x86": + + CXXFLAGS += [ + "-msse2" + ] + - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("base_internal_gn") -diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build -index c1b4dec3de4d..d2251519a32f 100644 ---- third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build -+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build ++ DEFINES["USE_X11"] = "1" + + Library("bad_optional_access_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build +index 08cc9180d644..edc6c3091d3e 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True FINAL_LIBRARY = "webrtc" -@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -36,138 +41,16 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -66332,7 +90414,7 @@ index c1b4dec3de4d..d2251519a32f 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["_GNU_SOURCE"] = True - @@ -66355,6 +90437,7 @@ index c1b4dec3de4d..d2251519a32f 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -66386,18 +90469,32 @@ index c1b4dec3de4d..d2251519a32f 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "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"] == "Linux": +- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -66419,6 +90516,10 @@ index c1b4dec3de4d..d2251519a32f 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - +- CXXFLAGS += [ +- "-msse2" +- ] +- - OS_LIBS += [ - "android_support" - ] @@ -66432,31 +90533,38 @@ index c1b4dec3de4d..d2251519a32f 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["CPU_ARCH"] == "x86": + + CXXFLAGS += [ + "-msse2" + ] + - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("config_gn") -diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build -index 652e6a65967f..5a597d0edf3c 100644 ---- third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build -+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build ++ DEFINES["USE_X11"] = "1" + + Library("bad_variant_access_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build +index 96113b00bd5d..f68149f85c45 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True FINAL_LIBRARY = "webrtc" -@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -66464,7 +90572,7 @@ index 652e6a65967f..5a597d0edf3c 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["_GNU_SOURCE"] = True - @@ -66487,6 +90595,7 @@ index 652e6a65967f..5a597d0edf3c 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -66518,6 +90627,14 @@ index 652e6a65967f..5a597d0edf3c 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -66539,9 +90656,10 @@ index 652e6a65967f..5a597d0edf3c 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -66571,24 +90689,24 @@ index 652e6a65967f..5a597d0edf3c 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("core_headers_gn") -diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build -index 8a106d7421e8..da843b39d995 100644 ---- third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build -+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build + Library("optional_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build +index 31e83327e0d0..293b2b62e2e5 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True FINAL_LIBRARY = "webrtc" -@@ -35,129 +40,12 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -66596,7 +90714,7 @@ index 8a106d7421e8..da843b39d995 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["_GNU_SOURCE"] = True - @@ -66619,6 +90737,7 @@ index 8a106d7421e8..da843b39d995 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -66650,11 +90769,13 @@ index 8a106d7421e8..da843b39d995 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - --if CONFIG["CPU_ARCH"] == "arm": +-if CONFIG["CPU_ARCH"] == "mips32": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -66662,24 +90783,25 @@ index 8a106d7421e8..da843b39d995 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True - +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -66688,12 +90810,7 @@ index 8a106d7421e8..da843b39d995 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -66708,34 +90825,30 @@ index 8a106d7421e8..da843b39d995 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("log_severity_gn") -diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build -index 2445527602c9..4948630ceefc 100644 ---- third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build -+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build + Library("span_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build +index 90e8e3b9d115..59ea6584a0f4 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True FINAL_LIBRARY = "webrtc" -@@ -35,129 +40,12 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -66743,7 +90856,7 @@ index 2445527602c9..4948630ceefc 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["_GNU_SOURCE"] = True - @@ -66766,6 +90879,7 @@ index 2445527602c9..4948630ceefc 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -66797,11 +90911,13 @@ index 2445527602c9..4948630ceefc 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - --if CONFIG["CPU_ARCH"] == "arm": +-if CONFIG["CPU_ARCH"] == "mips32": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -66809,24 +90925,25 @@ index 2445527602c9..4948630ceefc 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["_DEBUG"] = True -- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True - +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -66835,12 +90952,7 @@ index 2445527602c9..4948630ceefc 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -66855,34 +90967,30 @@ index 2445527602c9..4948630ceefc 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("raw_logging_internal_gn") -diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build -index cd7fed08714c..000beff5cca4 100644 ---- third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build -+++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build + Library("variant_gn") +diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build +index 180c8a2fbbf7..c06e16fa60f4 100644 +--- third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build ++++ third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True FINAL_LIBRARY = "webrtc" -@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -66890,7 +90998,7 @@ index cd7fed08714c..000beff5cca4 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["_GNU_SOURCE"] = True - @@ -66913,6 +91021,7 @@ index cd7fed08714c..000beff5cca4 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -66944,6 +91053,14 @@ index cd7fed08714c..000beff5cca4 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -66965,9 +91082,10 @@ index cd7fed08714c..000beff5cca4 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -66997,24 +91115,312 @@ index cd7fed08714c..000beff5cca4 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("compressed_tuple_gn") -diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/flat_hash_map_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/flat_hash_map_gn/moz.build -index c04bd9ad5d68..1c42939aaf6e 100644 ---- third_party/libwebrtc/third_party/abseil-cpp/absl/container/flat_hash_map_gn/moz.build -+++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/flat_hash_map_gn/moz.build -@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] - AllowCompilerWarnings() - + Library("utility_gn") +diff --git third_party/libwebrtc/third_party/drm/drm_gn/moz.build third_party/libwebrtc/third_party/drm/drm_gn/moz.build +deleted file mode 100644 +index 78ba6b526064..000000000000 +--- third_party/libwebrtc/third_party/drm/drm_gn/moz.build ++++ /dev/null +@@ -1,88 +0,0 @@ +-# This Source Code Form is subject to the terms of the Mozilla Public +-# License, v. 2.0. If a copy of the MPL was not distributed with this +-# file, You can obtain one at http://mozilla.org/MPL/2.0/. +- +- +- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### +- ### DO NOT edit it by hand. ### +- +-COMPILE_FLAGS["OS_INCLUDES"] = [] +-AllowCompilerWarnings() +- +-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True +-DEFINES["RTC_ENABLE_VP9"] = True +-DEFINES["USE_AURA"] = "1" +-DEFINES["USE_GLIB"] = "1" +-DEFINES["USE_NSS_CERTS"] = "1" +-DEFINES["USE_OZONE"] = "1" +-DEFINES["USE_UDEV"] = True +-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" +-DEFINES["WEBRTC_LIBRARY_IMPL"] = True +-DEFINES["WEBRTC_LINUX"] = True +-DEFINES["WEBRTC_MOZILLA_BUILD"] = True +-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +-DEFINES["WEBRTC_POSIX"] = True +-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +-DEFINES["_FILE_OFFSET_BITS"] = "64" +-DEFINES["_GNU_SOURCE"] = True +-DEFINES["_LARGEFILE64_SOURCE"] = True +-DEFINES["_LARGEFILE_SOURCE"] = True +-DEFINES["__STDC_CONSTANT_MACROS"] = True +-DEFINES["__STDC_FORMAT_MACROS"] = True +- +-FINAL_LIBRARY = "webrtc" +- +- +-LOCAL_INCLUDES += [ +- "!/ipc/ipdl/_ipdlheaders", +- "!/third_party/libwebrtc/gen", +- "/ipc/chromium/src", +- "/third_party/drm/drm/", +- "/third_party/drm/drm/include/", +- "/third_party/drm/drm/include/libdrm/", +- "/third_party/libwebrtc/", +- "/third_party/libwebrtc/third_party/abseil-cpp/", +- "/tools/profiler/public" +-] +- +-if not CONFIG["MOZ_DEBUG"]: +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" +- DEFINES["NDEBUG"] = True +- DEFINES["NVALGRIND"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1": +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- DEFINES["_DEBUG"] = True +- +-if CONFIG["CPU_ARCH"] == "aarch64": +- +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["MIPS32_LE"] = True +- DEFINES["MIPS_FPU_LE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-Library("drm_gn") +diff --git third_party/libwebrtc/third_party/gbm/gbm_gn/moz.build third_party/libwebrtc/third_party/gbm/gbm_gn/moz.build +deleted file mode 100644 +index 173399cf13bd..000000000000 +--- third_party/libwebrtc/third_party/gbm/gbm_gn/moz.build ++++ /dev/null +@@ -1,86 +0,0 @@ +-# This Source Code Form is subject to the terms of the Mozilla Public +-# License, v. 2.0. If a copy of the MPL was not distributed with this +-# file, You can obtain one at http://mozilla.org/MPL/2.0/. +- +- +- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### +- ### DO NOT edit it by hand. ### +- +-COMPILE_FLAGS["OS_INCLUDES"] = [] +-AllowCompilerWarnings() +- +-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True +-DEFINES["RTC_ENABLE_VP9"] = True +-DEFINES["USE_AURA"] = "1" +-DEFINES["USE_GLIB"] = "1" +-DEFINES["USE_NSS_CERTS"] = "1" +-DEFINES["USE_OZONE"] = "1" +-DEFINES["USE_UDEV"] = True +-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" +-DEFINES["WEBRTC_LIBRARY_IMPL"] = True +-DEFINES["WEBRTC_LINUX"] = True +-DEFINES["WEBRTC_MOZILLA_BUILD"] = True +-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +-DEFINES["WEBRTC_POSIX"] = True +-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +-DEFINES["_FILE_OFFSET_BITS"] = "64" +-DEFINES["_GNU_SOURCE"] = True +-DEFINES["_LARGEFILE64_SOURCE"] = True +-DEFINES["_LARGEFILE_SOURCE"] = True +-DEFINES["__STDC_CONSTANT_MACROS"] = True +-DEFINES["__STDC_FORMAT_MACROS"] = True +- +-FINAL_LIBRARY = "webrtc" +- +- +-LOCAL_INCLUDES += [ +- "!/ipc/ipdl/_ipdlheaders", +- "!/third_party/libwebrtc/gen", +- "/ipc/chromium/src", +- "/third_party/gbm/gbm/", +- "/third_party/libwebrtc/", +- "/third_party/libwebrtc/third_party/abseil-cpp/", +- "/tools/profiler/public" +-] +- +-if not CONFIG["MOZ_DEBUG"]: +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" +- DEFINES["NDEBUG"] = True +- DEFINES["NVALGRIND"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1": +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- DEFINES["_DEBUG"] = True +- +-if CONFIG["CPU_ARCH"] == "aarch64": +- +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["MIPS32_LE"] = True +- DEFINES["MIPS_FPU_LE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-Library("gbm_gn") +diff --git third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build +deleted file mode 100644 +index 646e12d72d60..000000000000 +--- third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build ++++ /dev/null +@@ -1,87 +0,0 @@ +-# This Source Code Form is subject to the terms of the Mozilla Public +-# License, v. 2.0. If a copy of the MPL was not distributed with this +-# file, You can obtain one at http://mozilla.org/MPL/2.0/. +- +- +- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### +- ### DO NOT edit it by hand. ### +- +-COMPILE_FLAGS["OS_INCLUDES"] = [] +-AllowCompilerWarnings() +- +-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True +-DEFINES["RTC_ENABLE_VP9"] = True +-DEFINES["USE_AURA"] = "1" +-DEFINES["USE_GLIB"] = "1" +-DEFINES["USE_NSS_CERTS"] = "1" +-DEFINES["USE_OZONE"] = "1" +-DEFINES["USE_UDEV"] = True +-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" +-DEFINES["WEBRTC_LIBRARY_IMPL"] = True +-DEFINES["WEBRTC_LINUX"] = True +-DEFINES["WEBRTC_MOZILLA_BUILD"] = True +-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +-DEFINES["WEBRTC_POSIX"] = True +-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +-DEFINES["_FILE_OFFSET_BITS"] = "64" +-DEFINES["_GNU_SOURCE"] = True +-DEFINES["_LARGEFILE64_SOURCE"] = True +-DEFINES["_LARGEFILE_SOURCE"] = True +-DEFINES["__STDC_CONSTANT_MACROS"] = True +-DEFINES["__STDC_FORMAT_MACROS"] = True +- +-FINAL_LIBRARY = "webrtc" +- +- +-LOCAL_INCLUDES += [ +- "!/ipc/ipdl/_ipdlheaders", +- "!/third_party/libwebrtc/gen", +- "/gfx/angle/checkout/include/", +- "/ipc/chromium/src", +- "/third_party/libepoxy/libepoxy/include/", +- "/third_party/libwebrtc/", +- "/third_party/libwebrtc/third_party/abseil-cpp/", +- "/tools/profiler/public" +-] +- +-if not CONFIG["MOZ_DEBUG"]: +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" +- DEFINES["NDEBUG"] = True +- DEFINES["NVALGRIND"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1": +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- DEFINES["_DEBUG"] = True +- +-if CONFIG["CPU_ARCH"] == "aarch64": +- +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["MIPS32_LE"] = True +- DEFINES["MIPS_FPU_LE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-Library("epoxy_gn") +diff --git third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build +index 2d97f962e7f9..dcece6e53f93 100644 +--- third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build ++++ third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -41,103 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -67022,14 +91428,24 @@ index c04bd9ad5d68..1c42939aaf6e 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Darwin": - +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -67038,17 +91454,26 @@ index c04bd9ad5d68..1c42939aaf6e 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -67058,32 +91483,60 @@ index c04bd9ad5d68..1c42939aaf6e 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True -- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True - +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -147,57 +70,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_DEBUG"] = True - +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -67097,9 +91550,10 @@ index c04bd9ad5d68..1c42939aaf6e 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -67129,24 +91583,27 @@ index c04bd9ad5d68..1c42939aaf6e 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("flat_hash_map_gn") -diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build -index 36df98d790fa..a7693ca193ac 100644 ---- third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build -+++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build -@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] + Library("yuv_gn") +diff --git third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build +index 27095596f717..5394d07cc759 100644 +--- third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build ++++ third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build +@@ -9,6 +9,14 @@ + COMPILE_FLAGS["OS_INCLUDES"] = [] AllowCompilerWarnings() - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True - ++DEFINES["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True ++ FINAL_LIBRARY = "webrtc" -@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]: + +@@ -33,151 +41,28 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -67154,14 +91611,18 @@ index 36df98d790fa..a7693ca193ac 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -67173,14 +91634,19 @@ index 36df98d790fa..a7693ca193ac 100644 - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -67195,27 +91661,47 @@ index 36df98d790fa..a7693ca193ac 100644 - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True -- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True -- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True +- DEFINES["_USE_MATH_DEFINES"] = True - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "arm": +- +- CFLAGS += [ +- "-mfpu=neon" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["PFFFT_SIMD_DISABLE"] = True +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "mips64": + + DEFINES["PFFFT_SIMD_DISABLE"] = True +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "ppc64": + + DEFINES["PFFFT_SIMD_DISABLE"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_DEBUG"] = True - +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -67240,13 +91726,19 @@ index 36df98d790fa..a7693ca193ac 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -- ++if CONFIG["CPU_ARCH"] == "x86": + + CFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": @@ -67255,30 +91747,131 @@ index 36df98d790fa..a7693ca193ac 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - +- CFLAGS += [ +- "-msse2" +- ] +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("pffft_gn") +diff --git third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build +deleted file mode 100644 +index 86a0daf8fa51..000000000000 +--- third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build ++++ /dev/null +@@ -1,87 +0,0 @@ +-# This Source Code Form is subject to the terms of the Mozilla Public +-# License, v. 2.0. If a copy of the MPL was not distributed with this +-# file, You can obtain one at http://mozilla.org/MPL/2.0/. +- +- +- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### +- ### DO NOT edit it by hand. ### +- +-COMPILE_FLAGS["OS_INCLUDES"] = [] +-AllowCompilerWarnings() +- +-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True +-DEFINES["RTC_ENABLE_VP9"] = True +-DEFINES["USE_AURA"] = "1" +-DEFINES["USE_GLIB"] = "1" +-DEFINES["USE_NSS_CERTS"] = "1" +-DEFINES["USE_OZONE"] = "1" +-DEFINES["USE_UDEV"] = True +-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" +-DEFINES["WEBRTC_LIBRARY_IMPL"] = True +-DEFINES["WEBRTC_LINUX"] = True +-DEFINES["WEBRTC_MOZILLA_BUILD"] = True +-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +-DEFINES["WEBRTC_POSIX"] = True +-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +-DEFINES["WEBRTC_USE_PIPEWIRE"] = True +-DEFINES["_FILE_OFFSET_BITS"] = "64" +-DEFINES["_GNU_SOURCE"] = True +-DEFINES["_LARGEFILE64_SOURCE"] = True +-DEFINES["_LARGEFILE_SOURCE"] = True +-DEFINES["__STDC_CONSTANT_MACROS"] = True +-DEFINES["__STDC_FORMAT_MACROS"] = True +- +-FINAL_LIBRARY = "webrtc" +- +- +-LOCAL_INCLUDES += [ +- "!/ipc/ipdl/_ipdlheaders", +- "!/third_party/libwebrtc/gen", +- "/ipc/chromium/src", +- "/third_party/libwebrtc/", +- "/third_party/libwebrtc/third_party/abseil-cpp/", +- "/third_party/pipewire/", +- "/tools/profiler/public" +-] - - Library("inlined_vector_gn") -diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build -index b5f65b9c7324..48833b0dc3a7 100644 ---- third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build -+++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build -@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] +-if not CONFIG["MOZ_DEBUG"]: +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" +- DEFINES["NDEBUG"] = True +- DEFINES["NVALGRIND"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1": +- +- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- DEFINES["_DEBUG"] = True +- +-if CONFIG["CPU_ARCH"] == "aarch64": +- +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["MIPS32_LE"] = True +- DEFINES["MIPS_FPU_LE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- +-Library("pipewire_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 2a3db9a62207..087012313675 100644 +--- third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build ++++ third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build +@@ -9,6 +9,14 @@ + COMPILE_FLAGS["OS_INCLUDES"] = [] AllowCompilerWarnings() - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" ++DEFINES["USE_OZONE"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True - ++DEFINES["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True ++ FINAL_LIBRARY = "webrtc" -@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]: + +@@ -33,144 +41,16 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -67286,14 +91879,18 @@ index b5f65b9c7324..48833b0dc3a7 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -67305,14 +91902,19 @@ index b5f65b9c7324..48833b0dc3a7 100644 - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -67327,12 +91929,10 @@ index b5f65b9c7324..48833b0dc3a7 100644 - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True -- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True -- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True @@ -67340,18 +91940,32 @@ index b5f65b9c7324..48833b0dc3a7 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "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"] == "Linux": +- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -67373,6 +91987,10 @@ index b5f65b9c7324..48833b0dc3a7 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - +- CXXFLAGS += [ +- "-msse2" +- ] +- - OS_LIBS += [ - "android_support" - ] @@ -67386,31 +92004,47 @@ index b5f65b9c7324..48833b0dc3a7 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["CPU_ARCH"] == "x86": + + CXXFLAGS += [ + "-msse2" + ] + - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("inlined_vector_internal_gn") -diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build -index f0a2b489ba7b..8aab5de10d16 100644 ---- third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build -+++ third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build -@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] - AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + 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 e0f103cc6cbd..c019774c6343 100644 +--- third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build ++++ third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -52,190 +61,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -67418,14 +92052,28 @@ index f0a2b489ba7b..8aab5de10d16 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] - -if CONFIG["OS_TARGET"] == "Darwin": - +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -67434,17 +92082,30 @@ index f0a2b489ba7b..8aab5de10d16 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -67454,17 +92115,17 @@ index f0a2b489ba7b..8aab5de10d16 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True -- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True @@ -67472,14 +92133,55 @@ index f0a2b489ba7b..8aab5de10d16 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_DEBUG"] = True - +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -67505,6 +92207,10 @@ index f0a2b489ba7b..8aab5de10d16 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -67518,31 +92224,49 @@ index f0a2b489ba7b..8aab5de10d16 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("memory_gn") -diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build -index 6114f68114ee..c9a0811d6272 100644 ---- third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build -+++ third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build -@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] - AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 ea2b54bfb866..2dc027987bb6 100644 +--- third_party/libwebrtc/video/config/encoder_config_gn/moz.build ++++ third_party/libwebrtc/video/config/encoder_config_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -67550,14 +92274,28 @@ index 6114f68114ee..c9a0811d6272 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] - -if CONFIG["OS_TARGET"] == "Darwin": - +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -67566,17 +92304,26 @@ index 6114f68114ee..c9a0811d6272 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -67586,17 +92333,17 @@ index 6114f68114ee..c9a0811d6272 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True -- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True @@ -67604,14 +92351,52 @@ index 6114f68114ee..c9a0811d6272 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +- OS_LIBS += [ +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_DEBUG"] = True - +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -67637,6 +92422,10 @@ index 6114f68114ee..c9a0811d6272 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -67650,31 +92439,49 @@ index 6114f68114ee..c9a0811d6272 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("type_traits_gn") -diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build -index 69affa55af2e..4977717f4af0 100644 ---- third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build -+++ third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build -@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] - AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 9e174cff3ccb..3ab1b0d83805 100644 +--- third_party/libwebrtc/video/config/streams_config_gn/moz.build ++++ third_party/libwebrtc/video/config/streams_config_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -35,129 +40,12 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -67682,14 +92489,29 @@ index 69affa55af2e..4977717f4af0 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "GLESv2", +- "log" +- ] - -if CONFIG["OS_TARGET"] == "Darwin": - +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -67698,17 +92520,30 @@ index 69affa55af2e..4977717f4af0 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -67718,17 +92553,17 @@ index 69affa55af2e..4977717f4af0 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True -- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True @@ -67736,12 +92571,47 @@ index 69affa55af2e..4977717f4af0 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + -if CONFIG["CPU_ARCH"] == "arm": - - CXXFLAGS += [ - "-mfpu=neon" - ] - +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -67756,8 +92626,8 @@ index 69affa55af2e..4977717f4af0 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True - +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" @@ -67774,8 +92644,7 @@ index 69affa55af2e..4977717f4af0 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -67793,35 +92662,49 @@ index 69affa55af2e..4977717f4af0 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("int128_gn") -diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/strings/internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/strings/internal_gn/moz.build -index 3742d55f8420..b4eba87aca14 100644 ---- third_party/libwebrtc/third_party/abseil-cpp/absl/strings/internal_gn/moz.build -+++ third_party/libwebrtc/third_party/abseil-cpp/absl/strings/internal_gn/moz.build -@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] - AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("streams_config_gn") +diff --git third_party/libwebrtc/video/decode_synchronizer_gn/moz.build third_party/libwebrtc/video/decode_synchronizer_gn/moz.build +index de01a944eadc..f306e996bb22 100644 +--- third_party/libwebrtc/video/decode_synchronizer_gn/moz.build ++++ third_party/libwebrtc/video/decode_synchronizer_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -37,129 +42,12 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -67829,14 +92712,28 @@ index 3742d55f8420..b4eba87aca14 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] - -if CONFIG["OS_TARGET"] == "Darwin": - +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -67845,17 +92742,30 @@ index 3742d55f8420..b4eba87aca14 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -67865,17 +92775,17 @@ index 3742d55f8420..b4eba87aca14 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True -- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True @@ -67883,12 +92793,47 @@ index 3742d55f8420..b4eba87aca14 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + -if CONFIG["CPU_ARCH"] == "arm": - - CXXFLAGS += [ - "-mfpu=neon" - ] - +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -67903,8 +92848,8 @@ index 3742d55f8420..b4eba87aca14 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True - +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" @@ -67921,8 +92866,7 @@ index 3742d55f8420..b4eba87aca14 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -67940,35 +92884,49 @@ index 3742d55f8420..b4eba87aca14 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("internal_gn") -diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build -index c0b3ff9df0b9..8b091bdbc78f 100644 ---- third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build -+++ third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build -@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] - AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("decode_synchronizer_gn") +diff --git third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build +index 2f7abf4617c9..f0eff3beb31c 100644 +--- third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build ++++ third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -50,129 +55,12 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -67976,14 +92934,28 @@ index c0b3ff9df0b9..8b091bdbc78f 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] - -if CONFIG["OS_TARGET"] == "Darwin": - +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -67992,17 +92964,30 @@ index c0b3ff9df0b9..8b091bdbc78f 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -68012,17 +92997,17 @@ index c0b3ff9df0b9..8b091bdbc78f 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True -- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True @@ -68030,20 +93015,55 @@ index c0b3ff9df0b9..8b091bdbc78f 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + -if CONFIG["CPU_ARCH"] == "arm": - - CXXFLAGS += [ - "-mfpu=neon" - ] - +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_DEBUG"] = True - +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -68069,10 +93089,10 @@ index c0b3ff9df0b9..8b091bdbc78f 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -68086,36 +93106,49 @@ index c0b3ff9df0b9..8b091bdbc78f 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("strings_gn") -diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build -index 2bd4896cfc2c..df99b3dba347 100644 ---- third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build -+++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build -@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] - AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 834d9880e79f..b37ca42dd139 100644 +--- third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build ++++ third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -35,129 +40,12 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -68123,14 +93156,28 @@ index 2bd4896cfc2c..df99b3dba347 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] - -if CONFIG["OS_TARGET"] == "Darwin": - +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -68139,17 +93186,30 @@ index 2bd4896cfc2c..df99b3dba347 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -68159,17 +93219,17 @@ index 2bd4896cfc2c..df99b3dba347 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True -- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True @@ -68177,12 +93237,41 @@ index 2bd4896cfc2c..df99b3dba347 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": - +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -68197,16 +93286,17 @@ index 2bd4896cfc2c..df99b3dba347 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True - +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -68215,12 +93305,7 @@ index 2bd4896cfc2c..df99b3dba347 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - OS_LIBS += [ - "android_support" - ] @@ -68235,34 +93320,39 @@ index 2bd4896cfc2c..df99b3dba347 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - - Library("bad_optional_access_gn") -diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build -index 349a94d61f55..9189b1a5f0c2 100644 ---- third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build -+++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build -@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] - AllowCompilerWarnings() - + Library("frame_decode_scheduler_gn") +diff --git third_party/libwebrtc/video/frame_decode_timing_gn/moz.build third_party/libwebrtc/video/frame_decode_timing_gn/moz.build +index 570b927d3a81..40d9a4ffcc46 100644 +--- third_party/libwebrtc/video/frame_decode_timing_gn/moz.build ++++ third_party/libwebrtc/video/frame_decode_timing_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -35,129 +40,12 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -68270,14 +93360,28 @@ index 349a94d61f55..9189b1a5f0c2 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] - -if CONFIG["OS_TARGET"] == "Darwin": - +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -68286,17 +93390,30 @@ index 349a94d61f55..9189b1a5f0c2 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -68306,17 +93423,17 @@ index 349a94d61f55..9189b1a5f0c2 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True -- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True @@ -68324,12 +93441,47 @@ index 349a94d61f55..9189b1a5f0c2 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + -if CONFIG["CPU_ARCH"] == "arm": - - CXXFLAGS += [ - "-mfpu=neon" - ] - +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -68344,8 +93496,8 @@ index 349a94d61f55..9189b1a5f0c2 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True - +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" @@ -68362,8 +93514,7 @@ index 349a94d61f55..9189b1a5f0c2 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -68381,35 +93532,49 @@ index 349a94d61f55..9189b1a5f0c2 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("bad_variant_access_gn") -diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build -index 3d21756a392e..3dd5e187cdab 100644 ---- third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build -+++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build -@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] - AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 3266e8f07fbf..254d05acd491 100644 +--- third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build ++++ third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -68417,14 +93582,29 @@ index 3d21756a392e..3dd5e187cdab 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "GLESv2", +- "log" +- ] - -if CONFIG["OS_TARGET"] == "Darwin": - +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -68433,17 +93613,30 @@ index 3d21756a392e..3dd5e187cdab 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -68453,17 +93646,17 @@ index 3d21756a392e..3dd5e187cdab 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True -- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True @@ -68471,14 +93664,55 @@ index 3d21756a392e..3dd5e187cdab 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_DEBUG"] = True - +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -68504,6 +93738,10 @@ index 3d21756a392e..3dd5e187cdab 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -68517,31 +93755,49 @@ index 3d21756a392e..3dd5e187cdab 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("optional_gn") -diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build -index 959c548b476d..4ea5fe663e36 100644 ---- third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build -+++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build -@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] - AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("frame_dumping_decoder_gn") +diff --git third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build +index c8b8614b0499..42958c3afcef 100644 +--- third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build ++++ third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -68549,14 +93805,28 @@ index 959c548b476d..4ea5fe663e36 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] - -if CONFIG["OS_TARGET"] == "Darwin": - +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -68565,17 +93835,26 @@ index 959c548b476d..4ea5fe663e36 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -68585,17 +93864,17 @@ index 959c548b476d..4ea5fe663e36 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True -- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True @@ -68603,14 +93882,52 @@ index 959c548b476d..4ea5fe663e36 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +- OS_LIBS += [ +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_DEBUG"] = True - +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -68636,6 +93953,10 @@ index 959c548b476d..4ea5fe663e36 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -68649,31 +93970,49 @@ index 959c548b476d..4ea5fe663e36 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("span_gn") -diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build -index b11a71fd0c62..6c74f9f8cb50 100644 ---- third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build -+++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build -@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] - AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 951c654ef6d2..a3b28f438f5d 100644 +--- third_party/libwebrtc/video/render/video_render_frames_gn/moz.build ++++ third_party/libwebrtc/video/render/video_render_frames_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -68681,14 +94020,28 @@ index b11a71fd0c62..6c74f9f8cb50 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] - -if CONFIG["OS_TARGET"] == "Darwin": - +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -68697,17 +94050,26 @@ index b11a71fd0c62..6c74f9f8cb50 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -68717,17 +94079,17 @@ index b11a71fd0c62..6c74f9f8cb50 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True -- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True @@ -68735,14 +94097,52 @@ index b11a71fd0c62..6c74f9f8cb50 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +- OS_LIBS += [ +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_DEBUG"] = True - +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -68768,6 +94168,10 @@ index b11a71fd0c62..6c74f9f8cb50 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -68781,31 +94185,49 @@ index b11a71fd0c62..6c74f9f8cb50 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("variant_gn") -diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build -index 5e5dbc641bfe..0482732d1b92 100644 ---- third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build -+++ third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build -@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] - AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 e9e33818dec5..f8bc9184d923 100644 +--- third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build ++++ third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True FINAL_LIBRARY = "webrtc" -@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -68813,14 +94235,28 @@ index 5e5dbc641bfe..0482732d1b92 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] - -if CONFIG["OS_TARGET"] == "Darwin": - +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Linux": - @@ -68829,17 +94265,30 @@ index 5e5dbc641bfe..0482732d1b92 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "rt" +- ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "WINNT": - @@ -68849,17 +94298,17 @@ index 5e5dbc641bfe..0482732d1b92 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" - DEFINES["WINVER"] = "0x0A00" - DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True -- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True - DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True @@ -68867,14 +94316,55 @@ index 5e5dbc641bfe..0482732d1b92 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_DEBUG"] = True - +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True @@ -68900,6 +94390,10 @@ index 5e5dbc641bfe..0482732d1b92 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -68913,34 +94407,49 @@ index 5e5dbc641bfe..0482732d1b92 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("utility_gn") -diff --git third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build -index 9f368c5bea1c..4dca3a9a25ed 100644 ---- third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build -+++ third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build -@@ -9,6 +9,14 @@ - COMPILE_FLAGS["OS_INCLUDES"] = [] - AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 de254b0f678e..177b8617949e 100644 +--- third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build ++++ third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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["__STDC_CONSTANT_MACROS"] = True +DEFINES["__STDC_FORMAT_MACROS"] = True -+ - FINAL_LIBRARY = "webrtc" + FINAL_LIBRARY = "webrtc" -@@ -32,140 +40,16 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -68948,14 +94457,20 @@ index 9f368c5bea1c..4dca3a9a25ed 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -if CONFIG["OS_TARGET"] == "Darwin": - +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" - DEFINES["__STDC_CONSTANT_MACROS"] = True @@ -68968,6 +94483,8 @@ index 9f368c5bea1c..4dca3a9a25ed 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True @@ -68977,7 +94494,10 @@ index 9f368c5bea1c..4dca3a9a25ed 100644 -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True @@ -68992,6 +94512,7 @@ index 9f368c5bea1c..4dca3a9a25ed 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True - DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" @@ -68999,182 +94520,49 @@ index 9f368c5bea1c..4dca3a9a25ed 100644 - DEFINES["_ATL_NO_OPENGL"] = True - DEFINES["_CRT_RAND_S"] = True - DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True - DEFINES["_HAS_EXCEPTIONS"] = "0" - DEFINES["_HAS_NODISCARD"] = True - DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True - DEFINES["_SECURE_ATL"] = True - DEFINES["_UNICODE"] = True -- DEFINES["_USE_MATH_DEFINES"] = True - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- --if CONFIG["CPU_ARCH"] == "arm": -- -- CFLAGS += [ -- "-mfpu=neon" -- ] + DEFINES["_DEBUG"] = True - if CONFIG["CPU_ARCH"] == "ppc64": + if CONFIG["CPU_ARCH"] == "aarch64": - DEFINES["PFFFT_SIMD_DISABLE"] = True + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" -- --if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] +-if CONFIG["CPU_ARCH"] == "arm": - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - - CFLAGS += [ - "-msse2" - ] - -- OS_LIBS += [ -- "android_support" +- CXXFLAGS += [ +- "-mfpu=neon" - ] - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- -- CFLAGS += [ -- "-msse2" -- ] +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["CPU_ARCH"] == "mips64": - - 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 4d82cbfa21a5..fa28ac0809ac 100644 ---- third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build -+++ third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build -@@ -9,6 +9,14 @@ - COMPILE_FLAGS["OS_INCLUDES"] = [] - AllowCompilerWarnings() - -+DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "1" -+DEFINES["_FILE_OFFSET_BITS"] = "64" -+DEFINES["_LARGEFILE64_SOURCE"] = True -+DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True -+ - FINAL_LIBRARY = "webrtc" + if CONFIG["CPU_ARCH"] == "x86": -@@ -32,135 +40,12 @@ if not CONFIG["MOZ_DEBUG"]: - if CONFIG["MOZ_DEBUG"] == "1": - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - --if CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" -- DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True -- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_AURA"] = "1" -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_NSS_CERTS"] = "1" -- DEFINES["USE_OZONE"] = "1" -- DEFINES["USE_UDEV"] = True -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_X11"] = "1" -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True -- DEFINES["NOMINMAX"] = True -- DEFINES["NTDDI_VERSION"] = "0x0A000000" -- DEFINES["PSAPI_VERSION"] = "2" -- DEFINES["UNICODE"] = True -- DEFINES["USE_AURA"] = "1" -- DEFINES["WIN32"] = True -- DEFINES["WIN32_LEAN_AND_MEAN"] = True -- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" -- DEFINES["WINVER"] = "0x0A00" -- DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_RAND_S"] = True -- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True -- DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True -- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True -- DEFINES["_SECURE_ATL"] = True -- DEFINES["_UNICODE"] = True -- DEFINES["_WIN32_WINNT"] = "0x0A00" -- DEFINES["_WINDOWS"] = True -- DEFINES["__STD_C"] = True -- --if CONFIG["CPU_ARCH"] == "arm": +-if CONFIG["CPU_ARCH"] == "x86_64": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -69186,8 +94574,8 @@ index 4d82cbfa21a5..fa28ac0809ac 100644 - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True - +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -69208,8 +94596,7 @@ index 4d82cbfa21a5..fa28ac0809ac 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -69227,34 +94614,40 @@ index 4d82cbfa21a5..fa28ac0809ac 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - 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 d4504c740c91..dc3a7b245367 100644 ---- third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build -+++ third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 a0f2d5b6ef84..542c0c791108 100644 +--- third_party/libwebrtc/video/video_gn/moz.build ++++ third_party/libwebrtc/video/video_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -69263,7 +94656,7 @@ index d4504c740c91..dc3a7b245367 100644 FINAL_LIBRARY = "webrtc" -@@ -47,173 +56,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -65,191 +74,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -69271,7 +94664,7 @@ index d4504c740c91..dc3a7b245367 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -69311,13 +94704,13 @@ index d4504c740c91..dc3a7b245367 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -69375,6 +94768,24 @@ index d4504c740c91..dc3a7b245367 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -69408,8 +94819,7 @@ index d4504c740c91..dc3a7b245367 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -69427,34 +94837,40 @@ index d4504c740c91..dc3a7b245367 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("video_adaptation_gn") -diff --git third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build -index addd74837347..49f1746c0a7f 100644 ---- third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build -+++ third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "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 0de224d0dfb5..b74708587cec 100644 +--- third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build ++++ third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -69463,7 +94879,7 @@ index addd74837347..49f1746c0a7f 100644 FINAL_LIBRARY = "webrtc" -@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -69471,7 +94887,7 @@ index addd74837347..49f1746c0a7f 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -69482,7 +94898,6 @@ index addd74837347..49f1746c0a7f 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -69511,13 +94926,13 @@ index addd74837347..49f1746c0a7f 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -69575,6 +94990,24 @@ index addd74837347..49f1746c0a7f 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -69608,8 +95041,7 @@ index addd74837347..49f1746c0a7f 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -69627,34 +95059,40 @@ index addd74837347..49f1746c0a7f 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("frame_dumping_decoder_gn") -diff --git third_party/libwebrtc/video/video_gn/moz.build third_party/libwebrtc/video/video_gn/moz.build -index 32f507080486..22d44997d00b 100644 ---- third_party/libwebrtc/video/video_gn/moz.build -+++ third_party/libwebrtc/video/video_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() ++ DEFINES["USE_X11"] = "1" + Library("video_receive_stream_timeout_tracker_gn") +diff --git third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build +index a18b990a8d75..8b1e03633a54 100644 +--- third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build ++++ third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -69663,7 +95101,7 @@ index 32f507080486..22d44997d00b 100644 FINAL_LIBRARY = "webrtc" -@@ -69,173 +78,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -69671,7 +95109,7 @@ index 32f507080486..22d44997d00b 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -69711,13 +95149,13 @@ index 32f507080486..22d44997d00b 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -69775,6 +95213,24 @@ index 32f507080486..22d44997d00b 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -69808,8 +95264,7 @@ index 32f507080486..22d44997d00b 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -69827,34 +95282,40 @@ index 32f507080486..22d44997d00b 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("video_gn") ++ DEFINES["USE_X11"] = "1" + + 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 a4e180638985..34ee6fde3742 100644 +index cd70bcde35e5..004e04207c71 100644 --- third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build +++ third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -69863,7 +95324,7 @@ index a4e180638985..34ee6fde3742 100644 FINAL_LIBRARY = "webrtc" -@@ -45,173 +54,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -48,191 +57,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -69871,7 +95332,7 @@ index a4e180638985..34ee6fde3742 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -69911,13 +95372,13 @@ index a4e180638985..34ee6fde3742 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -69975,6 +95436,24 @@ index a4e180638985..34ee6fde3742 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -70008,8 +95487,7 @@ index a4e180638985..34ee6fde3742 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -70027,10 +95505,212 @@ index a4e180638985..34ee6fde3742 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("video_stream_encoder_impl_gn") +diff --git third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build +index e058513d4fb8..d51109a08c5f 100644 +--- third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build ++++ third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_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["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True - @@ -70038,23 +95718,24 @@ index a4e180638985..34ee6fde3742 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("video_stream_encoder_impl_gn") + Library("video_stream_encoder_interface_gn") diff --git third_party/libwebrtc/webrtc_gn/moz.build third_party/libwebrtc/webrtc_gn/moz.build -index f1195473488c..96a21b5e9fd0 100644 +index d06327372572..de606adc2f95 100644 --- third_party/libwebrtc/webrtc_gn/moz.build +++ third_party/libwebrtc/webrtc_gn/moz.build -@@ -11,10 +11,19 @@ AllowCompilerWarnings() - +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_X11"] = "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 @@ -70063,25 +95744,7 @@ index f1195473488c..96a21b5e9fd0 100644 FINAL_LIBRARY = "webrtc" -@@ -27,6 +36,17 @@ LOCAL_INCLUDES += [ - "/tools/profiler/public" - ] - -+OS_LIBS += [ -+ "X11", -+ "Xcomposite", -+ "Xdamage", -+ "Xext", -+ "Xfixes", -+ "Xrandr", -+ "Xrender", -+ "Xtst" -+] -+ - if not CONFIG["MOZ_DEBUG"]: - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" -@@ -36,207 +56,11 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,141 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -70089,7 +95752,7 @@ index f1195473488c..96a21b5e9fd0 100644 -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True @@ -70113,6 +95776,11 @@ index f1195473488c..96a21b5e9fd0 100644 - 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" @@ -70129,13 +95797,13 @@ index f1195473488c..96a21b5e9fd0 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_POSIX"] = True @@ -70207,12 +95875,22 @@ index f1195473488c..96a21b5e9fd0 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "ppc64": + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True - -- OS_LIBS += [ -- "m" -- ] +-if CONFIG["CPU_ARCH"] == "mips64": - +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -183,27 +68,7 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -70234,20 +95912,14 @@ index f1195473488c..96a21b5e9fd0 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- -- OS_LIBS += [ -- "X11", -- "Xcomposite", -- "Xdamage", -- "Xext", -- "Xfixes", -- "Xrandr", -- "Xrender", -- "Xtst" -- ] -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +@@ -218,33 +83,4 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": + "Xtst" + ] + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -70265,10 +95937,6 @@ index f1195473488c..96a21b5e9fd0 100644 - - DEFINES["_GNU_SOURCE"] = True - -- OS_LIBS += [ -- "m" -- ] -- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True @@ -70277,16 +95945,8 @@ index f1195473488c..96a21b5e9fd0 100644 - - DEFINES["_GNU_SOURCE"] = True - -- OS_LIBS += [ -- "m" -- ] -- -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_GNU_SOURCE"] = True -- -- OS_LIBS += [ -- "m" -- ] - Library("webrtc_gn") diff --git a/www/tor-browser/files/patch-libwebrtc-powerpc64 b/www/tor-browser/files/patch-libwebrtc-powerpc64 new file mode 100644 index 000000000..0dee667b1 --- /dev/null +++ b/www/tor-browser/files/patch-libwebrtc-powerpc64 @@ -0,0 +1,264 @@ +From ebc07ec32002c53702eb6e53ee1532ad2e0dc2bd Mon Sep 17 00:00:00 2001 +From: Marcus Comstedt +Date: Fri, 12 Mar 2021 23:27:16 +0100 +Subject: [PATCH 1/2] wav: Swap header fields as needed + +--- + third_party/webrtc/common_audio/wav_header.cc | 48 +++++++++++++++++-- + 1 file changed, 44 insertions(+), 4 deletions(-) + +--- third_party/libwebrtc/common_audio/wav_header.cc ++++ third_party/libwebrtc/common_audio/wav_header.cc +@@ -26,10 +26,6 @@ + namespace webrtc { + namespace { + +-#ifndef WEBRTC_ARCH_LITTLE_ENDIAN +-#error "Code not working properly for big endian platforms." +-#endif +- + #pragma pack(2) + struct ChunkHeader { + uint32_t ID; +@@ -111,9 +107,15 @@ static_assert(sizeof(WavHeaderIeeeFloat) == kIeeeFloatWavHeaderSize, + "no padding in header"); + + uint32_t PackFourCC(char a, char b, char c, char d) { ++#ifndef WEBRTC_ARCH_LITTLE_ENDIAN ++ uint32_t packed_value = ++ static_cast(a) << 24 | static_cast(b) << 16 | ++ static_cast(c) << 8 | static_cast(d); ++#else + uint32_t packed_value = + static_cast(a) | static_cast(b) << 8 | + static_cast(c) << 16 | static_cast(d) << 24; ++#endif + return packed_value; + } + +@@ -172,6 +174,9 @@ bool FindWaveChunk(ChunkHeader* chunk_header, + if (readable->Read(chunk_header, sizeof(*chunk_header)) != + sizeof(*chunk_header)) + return false; // EOF. ++#ifndef WEBRTC_ARCH_LITTLE_ENDIAN ++ chunk_header->Size = __builtin_bswap32(chunk_header->Size); ++#endif + if (ReadFourCC(chunk_header->ID) == sought_chunk_id) + return true; // Sought chunk found. + // Ignore current chunk by skipping its payload. +@@ -185,6 +190,14 @@ bool ReadFmtChunkData(FmtPcmSubchunk* fmt_subchunk, WavHeaderReader* readable) { + if (readable->Read(&(fmt_subchunk->AudioFormat), kFmtPcmSubchunkSize) != + kFmtPcmSubchunkSize) + return false; ++#ifndef WEBRTC_ARCH_LITTLE_ENDIAN ++ fmt_subchunk->AudioFormat = __builtin_bswap16(fmt_subchunk->AudioFormat); ++ fmt_subchunk->NumChannels = __builtin_bswap16(fmt_subchunk->NumChannels); ++ fmt_subchunk->SampleRate = __builtin_bswap32(fmt_subchunk->SampleRate); ++ fmt_subchunk->ByteRate = __builtin_bswap32(fmt_subchunk->ByteRate); ++ fmt_subchunk->BlockAlign = __builtin_bswap16(fmt_subchunk->BlockAlign); ++ fmt_subchunk->BitsPerSample = __builtin_bswap16(fmt_subchunk->BitsPerSample); ++#endif + const uint32_t fmt_size = fmt_subchunk->header.Size; + if (fmt_size != kFmtPcmSubchunkSize) { + // There is an optional two-byte extension field permitted to be present +@@ -225,6 +238,17 @@ void WritePcmWavHeader(size_t num_channels, + header.fmt.BitsPerSample = static_cast(8 * bytes_per_sample); + header.data.header.ID = PackFourCC('d', 'a', 't', 'a'); + header.data.header.Size = static_cast(bytes_in_payload); ++#ifndef WEBRTC_ARCH_LITTLE_ENDIAN ++ header.riff.header.Size = __builtin_bswap32(header.riff.header.Size); ++ header.fmt.header.Size = __builtin_bswap32(header.fmt.header.Size); ++ header.fmt.AudioFormat = __builtin_bswap16(header.fmt.AudioFormat); ++ header.fmt.NumChannels = __builtin_bswap16(header.fmt.NumChannels); ++ header.fmt.SampleRate = __builtin_bswap32(header.fmt.SampleRate); ++ header.fmt.ByteRate = __builtin_bswap32(header.fmt.ByteRate); ++ header.fmt.BlockAlign = __builtin_bswap16(header.fmt.BlockAlign); ++ header.fmt.BitsPerSample = __builtin_bswap16(header.fmt.BitsPerSample); ++ header.data.header.Size = __builtin_bswap32(header.data.header.Size); ++#endif + + // Do an extra copy rather than writing everything to buf directly, since buf + // might not be correctly aligned. +@@ -261,6 +285,19 @@ void WriteIeeeFloatWavHeader(size_t num_channels, + header.fact.SampleLength = static_cast(num_channels * num_samples); + header.data.header.ID = PackFourCC('d', 'a', 't', 'a'); + header.data.header.Size = static_cast(bytes_in_payload); ++#ifndef WEBRTC_ARCH_LITTLE_ENDIAN ++ header.riff.header.Size = __builtin_bswap32(header.riff.header.Size); ++ header.fmt.header.Size = __builtin_bswap32(header.fmt.header.Size); ++ header.fmt.AudioFormat = __builtin_bswap16(header.fmt.AudioFormat); ++ header.fmt.NumChannels = __builtin_bswap16(header.fmt.NumChannels); ++ header.fmt.SampleRate = __builtin_bswap32(header.fmt.SampleRate); ++ header.fmt.ByteRate = __builtin_bswap32(header.fmt.ByteRate); ++ header.fmt.BlockAlign = __builtin_bswap16(header.fmt.BlockAlign); ++ header.fmt.BitsPerSample = __builtin_bswap16(header.fmt.BitsPerSample); ++ header.fact.header.Size = __builtin_bswap32(header.fact.header.Size); ++ header.fact.SampleLength = __builtin_bswap32(header.fact.SampleLength); ++ header.data.header.Size = __builtin_bswap32(header.data.header.Size); ++#endif + + // Do an extra copy rather than writing everything to buf directly, since buf + // might not be correctly aligned. +@@ -387,6 +424,9 @@ bool ReadWavHeader(WavHeaderReader* readable, + return false; + if (ReadFourCC(header.riff.Format) != "WAVE") + return false; ++#ifndef WEBRTC_ARCH_LITTLE_ENDIAN ++ header.riff.header.Size = __builtin_bswap32(header.riff.header.Size); ++#endif + + // Find "fmt " and "data" chunks. While the official Wave file specification + // does not put requirements on the chunks order, it is uncommon to find the +-- +2.26.3 + + +From 28adaefe12a045a4adf7fdf56eb4e57db46dbe5e Mon Sep 17 00:00:00 2001 +From: Marcus Comstedt +Date: Fri, 12 Mar 2021 23:28:25 +0100 +Subject: [PATCH 2/2] wav: Implement sample swapping + +--- + third_party/webrtc/common_audio/wav_file.cc | 50 ++++++++++++++------- + 1 file changed, 34 insertions(+), 16 deletions(-) + +--- third_party/libwebrtc/common_audio/wav_file.cc ++++ third_party/libwebrtc/common_audio/wav_file.cc +@@ -89,10 +89,6 @@ void WavReader::Reset() { + + size_t WavReader::ReadSamples(const size_t num_samples, + int16_t* const samples) { +-#ifndef WEBRTC_ARCH_LITTLE_ENDIAN +-#error "Need to convert samples to big-endian when reading from WAV file" +-#endif +- + size_t num_samples_left_to_read = num_samples; + size_t next_chunk_start = 0; + while (num_samples_left_to_read > 0 && num_unread_samples_ > 0) { +@@ -107,6 +103,9 @@ size_t WavReader::ReadSamples(const size_t num_samples, + num_samples_read = num_bytes_read / sizeof(samples_to_convert[0]); + + for (size_t j = 0; j < num_samples_read; ++j) { ++#ifndef WEBRTC_ARCH_LITTLE_ENDIAN ++ *(uint32_t*)&samples_to_convert[j] = __builtin_bswap32(*(uint32_t*)&samples_to_convert[j]); ++#endif + samples[next_chunk_start + j] = FloatToS16(samples_to_convert[j]); + } + } else { +@@ -114,6 +113,11 @@ size_t WavReader::ReadSamples(const size_t num_samples, + num_bytes_read = file_.Read(&samples[next_chunk_start], + chunk_size * sizeof(samples[0])); + num_samples_read = num_bytes_read / sizeof(samples[0]); ++#ifndef WEBRTC_ARCH_LITTLE_ENDIAN ++ for (size_t j = 0; j < num_samples_read; ++j) { ++ samples[next_chunk_start + j] = __builtin_bswap16(samples[next_chunk_start + j]); ++ } ++#endif + } + RTC_CHECK(num_samples_read == 0 || (num_bytes_read % num_samples_read) == 0) + << "Corrupt file: file ended in the middle of a sample."; +@@ -129,10 +133,6 @@ size_t WavReader::ReadSamples(const size_t num_samples, + } + + size_t WavReader::ReadSamples(const size_t num_samples, float* const samples) { +-#ifndef WEBRTC_ARCH_LITTLE_ENDIAN +-#error "Need to convert samples to big-endian when reading from WAV file" +-#endif +- + size_t num_samples_left_to_read = num_samples; + size_t next_chunk_start = 0; + while (num_samples_left_to_read > 0 && num_unread_samples_ > 0) { +@@ -147,8 +147,13 @@ size_t WavReader::ReadSamples(const size_t num_samples, float* const samples) { + num_samples_read = num_bytes_read / sizeof(samples_to_convert[0]); + + for (size_t j = 0; j < num_samples_read; ++j) { ++#ifndef WEBRTC_ARCH_LITTLE_ENDIAN ++ samples[next_chunk_start + j] = ++ static_cast(static_cast(__builtin_bswap16(samples_to_convert[j]))); ++#else + samples[next_chunk_start + j] = + static_cast(samples_to_convert[j]); ++#endif + } + } else { + RTC_CHECK_EQ(format_, WavFormat::kWavFormatIeeeFloat); +@@ -157,6 +162,9 @@ size_t WavReader::ReadSamples(const size_t num_samples, float* const samples) { + num_samples_read = num_bytes_read / sizeof(samples[0]); + + for (size_t j = 0; j < num_samples_read; ++j) { ++#ifndef WEBRTC_ARCH_LITTLE_ENDIAN ++ *(uint32_t*)&samples[next_chunk_start + j] = __builtin_bswap32(*(uint32_t*)&samples[next_chunk_start + j]); ++#endif + samples[next_chunk_start + j] = + FloatToFloatS16(samples[next_chunk_start + j]); + } +@@ -213,23 +221,31 @@ WavWriter::WavWriter(FileWrapper file, + } + + void WavWriter::WriteSamples(const int16_t* samples, size_t num_samples) { +-#ifndef WEBRTC_ARCH_LITTLE_ENDIAN +-#error "Need to convert samples to little-endian when writing to WAV file" +-#endif +- + for (size_t i = 0; i < num_samples; i += kMaxChunksize) { + const size_t num_remaining_samples = num_samples - i; + const size_t num_samples_to_write = + std::min(kMaxChunksize, num_remaining_samples); + + if (format_ == WavFormat::kWavFormatPcm) { ++#ifndef WEBRTC_ARCH_LITTLE_ENDIAN ++ std::array converted_samples; ++ for (size_t j = 0; j < num_samples_to_write; ++j) { ++ converted_samples[j] = __builtin_bswap16(samples[i + j]); ++ } ++ RTC_CHECK( ++ file_.Write(converted_samples.data(), num_samples_to_write * sizeof(samples[0]))); ++#else + RTC_CHECK( + file_.Write(&samples[i], num_samples_to_write * sizeof(samples[0]))); ++#endif + } else { + RTC_CHECK_EQ(format_, WavFormat::kWavFormatIeeeFloat); + std::array converted_samples; + for (size_t j = 0; j < num_samples_to_write; ++j) { + converted_samples[j] = S16ToFloat(samples[i + j]); ++#ifndef WEBRTC_ARCH_LITTLE_ENDIAN ++ *(uint32_t*)&converted_samples[j] = __builtin_bswap32(*(uint32_t*)&converted_samples[j]); ++#endif + } + RTC_CHECK( + file_.Write(converted_samples.data(), +@@ -243,10 +259,6 @@ void WavWriter::WriteSamples(const int16_t* samples, size_t num_samples) { + } + + void WavWriter::WriteSamples(const float* samples, size_t num_samples) { +-#ifndef WEBRTC_ARCH_LITTLE_ENDIAN +-#error "Need to convert samples to little-endian when writing to WAV file" +-#endif +- + for (size_t i = 0; i < num_samples; i += kMaxChunksize) { + const size_t num_remaining_samples = num_samples - i; + const size_t num_samples_to_write = +@@ -256,6 +268,9 @@ void WavWriter::WriteSamples(const float* samples, size_t num_samples) { + std::array converted_samples; + for (size_t j = 0; j < num_samples_to_write; ++j) { + converted_samples[j] = FloatS16ToS16(samples[i + j]); ++#ifndef WEBRTC_ARCH_LITTLE_ENDIAN ++ converted_samples[j] = __builtin_bswap16(converted_samples[j]); ++#endif + } + RTC_CHECK( + file_.Write(converted_samples.data(), +@@ -265,6 +280,9 @@ void WavWriter::WriteSamples(const float* samples, size_t num_samples) { + std::array converted_samples; + for (size_t j = 0; j < num_samples_to_write; ++j) { + converted_samples[j] = FloatS16ToFloat(samples[i + j]); ++#ifndef WEBRTC_ARCH_LITTLE_ENDIAN ++ *(uint32_t*)&converted_samples[j] = __builtin_bswap32(*(uint32_t*)&converted_samples[j]); ++#endif + } + RTC_CHECK( + file_.Write(converted_samples.data(), +-- +2.26.3 + diff --git a/www/tor-browser/files/patch-memory_mozalloc_throw__gcc.h b/www/tor-browser/files/patch-memory_mozalloc_throw__gcc.h index 81a511179..53db05bc0 100644 --- a/www/tor-browser/files/patch-memory_mozalloc_throw__gcc.h +++ b/www/tor-browser/files/patch-memory_mozalloc_throw__gcc.h @@ -1,4 +1,4 @@ ---- memory/mozalloc/throw_gcc.h.orig 2022-02-02 17:33:38 UTC +--- memory/mozalloc/throw_gcc.h.orig 2022-03-05 00:14:41 UTC +++ memory/mozalloc/throw_gcc.h @@ -74,50 +74,66 @@ __throw_bad_function_call(void) { mozalloc_abort("fatal: STL threw bad_function_call"); diff --git a/www/tor-browser/files/patch-modules_fdlibm_src_math__private.h b/www/tor-browser/files/patch-modules_fdlibm_src_math__private.h new file mode 100644 index 000000000..8d893f31e --- /dev/null +++ b/www/tor-browser/files/patch-modules_fdlibm_src_math__private.h @@ -0,0 +1,27 @@ +commit 7a20fbf537ee0867244109d1ea48a8ad9de2e4ea +Author: Christoph Moench-Tegeder + + align typedefs with our libm for historical CPUs + +diff --git modules/fdlibm/src/math_private.h modules/fdlibm/src/math_private.h +index f4373f27834a..3b898241660f 100644 +--- modules/fdlibm/src/math_private.h ++++ modules/fdlibm/src/math_private.h +@@ -30,9 +30,17 @@ + * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t + */ + ++#ifdef __LP64__ + typedef double __double_t; ++#else ++typedef long double __double_t; ++#endif + typedef __double_t double_t; ++#ifdef __LP64__ + typedef float __float_t; ++#else ++typedef long double __float_t; ++#endif + + /* + * The original fdlibm code used statements like: diff --git a/www/tor-browser/files/patch-pipewire_init b/www/tor-browser/files/patch-pipewire_init index 6673f942d..04cd4c495 100644 --- a/www/tor-browser/files/patch-pipewire_init +++ b/www/tor-browser/files/patch-pipewire_init @@ -1,35 +1,48 @@ -Chase ABI from multimedia/pipewire/files/patch-src_pipewire_pipewire_init + Chase ABI from multimedia/pipewire/files/patch-src_pipewire_pipewire_init + + Ref: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1819 -https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1819 - -diff --git third_party/libwebrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc third_party/libwebrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc -index 2fd3b1a575..79a14d7d7e 100644 ---- third_party/libwebrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc -+++ third_party/libwebrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc -@@ -279,7 +279,7 @@ void BaseCapturerPipeWire::InitPipeWire() { - } - #endif // defined(WEBRTC_DLOPEN_PIPEWIRE) +diff --git third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc +index 49b64845100b..283c387db770 100644 +--- third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc ++++ third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc +@@ -402,7 +402,7 @@ bool SharedScreenCastStreamPrivate::StartScreenCastStream( + + pw_stream_node_id_ = stream_node_id; - pw_init(/*argc=*/nullptr, /*argc=*/nullptr); + pipewire_init(/*argc=*/nullptr, /*argc=*/nullptr); pw_main_loop_ = pw_thread_loop_new("pipewire-main-loop", nullptr); - pw_context_ = pw_context_new(pw_thread_loop_get_loop(pw_main_loop_), nullptr, 0); -diff --git third_party/libwebrtc/modules/desktop_capture/linux/pipewire.sigs third_party/libwebrtc/modules/desktop_capture/linux/pipewire.sigs -index 3e21e9dc07..f561dcf619 100644 ---- third_party/libwebrtc/modules/desktop_capture/linux/pipewire.sigs -+++ third_party/libwebrtc/modules/desktop_capture/linux/pipewire.sigs -@@ -16,7 +16,7 @@ void pw_loop_destroy(pw_loop *loop); - pw_loop * pw_loop_new(pw_properties *properties); + +diff --git third_party/libwebrtc/modules/desktop_capture/linux/wayland/test/test_screencast_stream_provider.cc third_party/libwebrtc/modules/desktop_capture/linux/wayland/test/test_screencast_stream_provider.cc +index 3b829959aca8..9bdcdf1ffd51 100644 +--- third_party/libwebrtc/modules/desktop_capture/linux/wayland/test/test_screencast_stream_provider.cc ++++ third_party/libwebrtc/modules/desktop_capture/linux/wayland/test/test_screencast_stream_provider.cc +@@ -36,7 +36,7 @@ TestScreenCastStreamProvider::TestScreenCastStreamProvider(Observer* observer, + return; + } + +- pw_init(/*argc=*/nullptr, /*argc=*/nullptr); ++ pipewire_init(/*argc=*/nullptr, /*argc=*/nullptr); + + pw_main_loop_ = pw_thread_loop_new("pipewire-test-main-loop", nullptr); + +diff --git third_party/libwebrtc/modules/portal/pipewire.sigs third_party/libwebrtc/modules/portal/pipewire.sigs +index 139a8c37a551..9fe131d8daa6 100644 +--- third_party/libwebrtc/modules/portal/pipewire.sigs ++++ third_party/libwebrtc/modules/portal/pipewire.sigs +@@ -15,7 +15,7 @@ pw_loop * pw_loop_new(const spa_dict *props); + // pipewire.h -void pw_init(int *argc, char **argv[]); +void pipewire_init(int *argc, char **argv[]); + const char* pw_get_library_version(); // properties.h - pw_properties * pw_properties_new_string(const char *args); diff --git third_party/pipewire/libpipewire/mozpipewire.cpp third_party/pipewire/libpipewire/mozpipewire.cpp -index 1ecfc3196a..6f44b35964 100644 +index fbeeb8e5a760..46f768790946 100644 --- third_party/pipewire/libpipewire/mozpipewire.cpp +++ third_party/pipewire/libpipewire/mozpipewire.cpp @@ -58,7 +58,7 @@ struct pw_context * (*pw_context_new_fn)(struct pw_loop *main_loop, @@ -41,7 +54,7 @@ index 1ecfc3196a..6f44b35964 100644 static void (*pw_stream_add_listener_fn)(struct pw_stream *stream, struct spa_hook *listener, const struct pw_stream_events *events, -@@ -96,7 +96,7 @@ bool IsPwLibraryLoaded() { +@@ -101,7 +101,7 @@ bool IsPwLibraryLoaded() { IS_FUNC_LOADED(pw_context_destroy_fn) && IS_FUNC_LOADED(pw_context_new_fn) && IS_FUNC_LOADED(pw_core_disconnect_fn) && @@ -49,8 +62,8 @@ index 1ecfc3196a..6f44b35964 100644 + IS_FUNC_LOADED(pipewire_init_fn) && IS_FUNC_LOADED(pw_stream_add_listener_fn) && IS_FUNC_LOADED(pw_stream_connect_fn) && - IS_FUNC_LOADED(pw_stream_dequeue_buffer_fn) && -@@ -133,7 +133,7 @@ bool LoadPWLibrary() { + IS_FUNC_LOADED(pw_stream_disconnect_fn) && +@@ -142,7 +142,7 @@ bool LoadPWLibrary() { GET_FUNC(pw_context_destroy, pwLib); GET_FUNC(pw_context_new, pwLib); GET_FUNC(pw_core_disconnect, pwLib); @@ -58,8 +71,8 @@ index 1ecfc3196a..6f44b35964 100644 + GET_FUNC(pipewire_init, pwLib); GET_FUNC(pw_stream_add_listener, pwLib); GET_FUNC(pw_stream_connect, pwLib); - GET_FUNC(pw_stream_dequeue_buffer, pwLib); -@@ -207,12 +207,12 @@ pw_core_disconnect(struct pw_core *core) + GET_FUNC(pw_stream_disconnect, pwLib); +@@ -220,12 +220,12 @@ pw_core_disconnect(struct pw_core *core) } void @@ -75,11 +88,11 @@ index 1ecfc3196a..6f44b35964 100644 void diff --git third_party/pipewire/pipewire/pipewire.h third_party/pipewire/pipewire/pipewire.h -index 69c523bd62..378502004c 100644 +index b932103f46e6..2c88e28421ec 100644 --- third_party/pipewire/pipewire/pipewire.h +++ third_party/pipewire/pipewire/pipewire.h -@@ -114,9 +114,9 @@ extern "C" { - * \brief PipeWire initialization and infrastructure functions +@@ -69,9 +69,9 @@ extern "C" { + * \{ */ void -pw_init(int *argc, char **argv[]); diff --git a/www/tor-browser/files/patch-python_mozbuild_mozbuild_gn__processor.py b/www/tor-browser/files/patch-python_mozbuild_mozbuild_gn__processor.py index 98af67e37..3d887a12c 100644 --- a/www/tor-browser/files/patch-python_mozbuild_mozbuild_gn__processor.py +++ b/www/tor-browser/files/patch-python_mozbuild_mozbuild_gn__processor.py @@ -1,6 +1,13 @@ ---- python/mozbuild/mozbuild/gn_processor.py.orig 2022-11-03 22:19:40.000000000 +0100 -+++ python/mozbuild/mozbuild/gn_processor.py 2022-11-07 21:11:42.596355000 +0100 -@@ -166,6 +166,7 @@ +commit 0c96c599752d8d8f68b5ed8a6344888d1b505773 +Author: Christoph Moench-Tegeder + + fixup gn_processor.py for FreeBSD + +diff --git python/mozbuild/mozbuild/gn_processor.py python/mozbuild/mozbuild/gn_processor.py +index b6c51ee010a8..15b4bda9df6e 100644 +--- python/mozbuild/mozbuild/gn_processor.py ++++ python/mozbuild/mozbuild/gn_processor.py +@@ -185,6 +185,7 @@ def filter_gn_config(path, gn_result, sandbox_vars, input_vars, gn_target): } oses = { "android": "Android", @@ -8,7 +15,7 @@ "linux": "Linux", "mac": "Darwin", "openbsd": "OpenBSD", -@@ -662,15 +663,15 @@ +@@ -735,16 +736,16 @@ def main(): vars_set = [] for is_debug in (True, False): @@ -24,11 +31,13 @@ + if target_os in ("android", "freebsd", "linux", "win"): target_cpus.append("x86") - if target_os == "linux": +- target_cpus.extend(["ppc64", "riscv64", "mipsel", "mips64el"]) + if target_os in ("freebsd", "linux"): - target_cpus.append("ppc64") ++ target_cpus.extend(["ppc64", "mipsel", "mips64el"]) for target_cpu in target_cpus: vars = { -@@ -679,7 +680,7 @@ + "host_cpu": "x64", +@@ -752,7 +753,7 @@ def main(): "target_cpu": target_cpu, "target_os": target_os, } diff --git a/www/tor-browser/files/patch-rust-1.70.0 b/www/tor-browser/files/patch-rust-1.70.0 deleted file mode 100644 index 233e51bee..000000000 --- a/www/tor-browser/files/patch-rust-1.70.0 +++ /dev/null @@ -1,33 +0,0 @@ -https://github.com/mozilla/mp4parse-rust/commit/8b5b652d38e007e736bb442ccd5aa5ed699db100 - -From 8b5b652d38e007e736bb442ccd5aa5ed699db100 Mon Sep 17 00:00:00 2001 -From: Matthew Gregan -Date: Thu, 16 Jun 2022 13:54:02 +1200 -Subject: [PATCH] Fix `unstable-name-collisions` warning by using fully - qualified path. - ---- - mp4parse/src/lib.rs | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/mp4parse/src/lib.rs b/mp4parse/src/lib.rs -index 567ee21d..4f3d7153 100644 ---- third_party/rust/mp4parse/src/lib.rs -+++ third_party/rust/mp4parse/src/lib.rs -@@ -3506,8 +3506,13 @@ macro_rules! impl_mul { - type Output = $output; - - fn mul(self, rhs: $rhs) -> Self::Output { -- static_assertions::const_assert!(<$output>::MAX <= <$inner>::MAX as u64); -- static_assertions::const_assert!(<$lhs>::MAX * <$rhs>::MAX <= <$output>::MAX); -+ static_assertions::const_assert!( -+ <$output as UpperBounded>::MAX <= <$inner>::MAX as u64 -+ ); -+ static_assertions::const_assert!( -+ <$lhs as UpperBounded>::MAX * <$rhs as UpperBounded>::MAX -+ <= <$output as UpperBounded>::MAX -+ ); - - let lhs: $inner = self.get().into(); - let rhs: $inner = rhs.get().into(); - diff --git a/www/tor-browser/files/patch-rust-1.73.0 b/www/tor-browser/files/patch-rust-1.73.0 deleted file mode 100644 index b838ffd90..000000000 --- a/www/tor-browser/files/patch-rust-1.73.0 +++ /dev/null @@ -1,83 +0,0 @@ -From a79edf4cfc54aad30a5630b217645c4b8274d8f7 Mon Sep 17 00:00:00 2001 -From: Oli Scherer -Date: Mon, 10 Jul 2023 09:46:53 +0000 -Subject: [PATCH] Stop using old-style `simd_shuffle` - ---- - src/codegen/llvm.rs | 20 +++++++------------- - 1 file changed, 7 insertions(+), 13 deletions(-) - -diff --git third_party/rust/packed_simd_2/src/codegen/llvm.rs third_party/rust/packed_simd_2/src/codegen/llvm.rs -index b4c09849..bb482fac 100644 ---- third_party/rust/packed_simd_2/src/codegen/llvm.rs -+++ third_party/rust/packed_simd_2/src/codegen/llvm.rs -@@ -5,14 +5,8 @@ use crate::sealed::Shuffle; - #[allow(unused_imports)] // FIXME: spurious warning? - use crate::sealed::Simd; - --// Shuffle intrinsics: expanded in users' crates, therefore public. - extern "platform-intrinsic" { -- pub fn simd_shuffle2(x: T, y: T, idx: [u32; 2]) -> U; -- pub fn simd_shuffle4(x: T, y: T, idx: [u32; 4]) -> U; -- pub fn simd_shuffle8(x: T, y: T, idx: [u32; 8]) -> U; -- pub fn simd_shuffle16(x: T, y: T, idx: [u32; 16]) -> U; -- pub fn simd_shuffle32(x: T, y: T, idx: [u32; 32]) -> U; -- pub fn simd_shuffle64(x: T, y: T, idx: [u32; 64]) -> U; -+ fn simd_shuffle(x: T, y: T, idx: I) -> U; - } - - #[allow(clippy::missing_safety_doc)] -@@ -22,7 +16,7 @@ where - T: Simd, - ::Element: Shuffle<[u32; 2], Output = U>, - { -- simd_shuffle2(x, y, IDX) -+ simd_shuffle(x, y, IDX) - } - - #[allow(clippy::missing_safety_doc)] -@@ -32,7 +26,7 @@ where - T: Simd, - ::Element: Shuffle<[u32; 4], Output = U>, - { -- simd_shuffle4(x, y, IDX) -+ simd_shuffle(x, y, IDX) - } - - #[allow(clippy::missing_safety_doc)] -@@ -42,7 +36,7 @@ where - T: Simd, - ::Element: Shuffle<[u32; 8], Output = U>, - { -- simd_shuffle8(x, y, IDX) -+ simd_shuffle(x, y, IDX) - } - - #[allow(clippy::missing_safety_doc)] -@@ -52,7 +46,7 @@ where - T: Simd, - ::Element: Shuffle<[u32; 16], Output = U>, - { -- simd_shuffle16(x, y, IDX) -+ simd_shuffle(x, y, IDX) - } - - #[allow(clippy::missing_safety_doc)] -@@ -62,7 +56,7 @@ where - T: Simd, - ::Element: Shuffle<[u32; 32], Output = U>, - { -- simd_shuffle32(x, y, IDX) -+ simd_shuffle(x, y, IDX) - } - - #[allow(clippy::missing_safety_doc)] -@@ -72,7 +66,7 @@ where - T: Simd, - ::Element: Shuffle<[u32; 64], Output = U>, - { -- simd_shuffle64(x, y, IDX) -+ simd_shuffle(x, y, IDX) - } - - extern "platform-intrinsic" { diff --git a/www/tor-browser/files/patch-third__party_libwebrtc_build_config_BUILDCONFIG.gn b/www/tor-browser/files/patch-third__party_libwebrtc_build_config_BUILDCONFIG.gn new file mode 100644 index 000000000..c865374a2 --- /dev/null +++ b/www/tor-browser/files/patch-third__party_libwebrtc_build_config_BUILDCONFIG.gn @@ -0,0 +1,37 @@ +--- third_party/libwebrtc/build/config/BUILDCONFIG.gn.orig 2022-10-09 20:42:58.113963000 +0200 ++++ third_party/libwebrtc/build/config/BUILDCONFIG.gn 2022-10-09 20:46:16.128220000 +0200 +@@ -132,6 +132,7 @@ + + # Set to true when compiling with the Clang compiler. + is_clang = current_os != "linux" || current_os == "openbsd" || ++ current_os == "freebsd" || + (current_cpu != "s390x" && current_cpu != "s390" && + current_cpu != "ppc64" && current_cpu != "ppc" && + current_cpu != "mips" && current_cpu != "mips64" && +@@ -184,7 +185,7 @@ + # TODO(dpranke): Add some sort of assert here that verifies that + # no toolchain omitted host_toolchain from its toolchain_args(). + +- if (host_os == "linux" || host_os == "openbsd") { ++ if (host_os == "linux" || host_os == "openbsd" || host_os == "freebsd") { + if (target_os != "linux") { + host_toolchain = "//build/toolchain/linux:clang_$host_cpu" + } else if (is_clang) { +@@ -222,7 +223,7 @@ + assert(host_os == "linux" || host_os == "mac", + "Android builds are only supported on Linux and Mac hosts.") + _default_toolchain = "//build/toolchain/android:android_clang_$target_cpu" +-} else if (target_os == "chromeos" || target_os == "linux" || target_os == "openbsd") { ++} else if (target_os == "chromeos" || target_os == "linux" || target_os == "openbsd" || target_os == "freebsd") { + # See comments in build/toolchain/cros/BUILD.gn about board compiles. + if (is_clang) { + _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" +@@ -288,7 +289,7 @@ + is_fuchsia = current_os == "fuchsia" + is_ios = current_os == "ios" + is_linux = current_os == "linux" +-is_bsd = current_os == "openbsd" ++is_bsd = current_os == "openbsd" || current_os == "freebsd" + is_mac = current_os == "mac" + is_nacl = current_os == "nacl" + is_win = current_os == "win" || current_os == "winuwp" diff --git a/www/tor-browser/files/patch-third__party_libwebrtc_rtc__base_ip__address.cc b/www/tor-browser/files/patch-third__party_libwebrtc_rtc__base_ip__address.cc new file mode 100644 index 000000000..5af9e7ec2 --- /dev/null +++ b/www/tor-browser/files/patch-third__party_libwebrtc_rtc__base_ip__address.cc @@ -0,0 +1,23 @@ +commit d1f5a45c1906e9f1e6a51f3b44c52d981bb3958c +Author: Christoph Moench-Tegeder +Date: Wed Oct 12 19:57:20 2022 +0200 + + pull in sys/types.h for u_XXX typedefs on FreeBSD 12 + + In file included from /wrkdirs/usr/ports/www/firefox/work/firefox-106.0/third_party/libwebrtc/rtc_base/ip_address.cc:20: + /usr/include/netinet/ip.h:53:2: error: unknown type name 'u_char'; did you mean 'char'? + u_char ip_hl:4, /* header length */ + +diff --git third_party/libwebrtc/rtc_base/ip_address.cc third_party/libwebrtc/rtc_base/ip_address.cc +index d544b611e149..ef9b742dac5f 100644 +--- third_party/libwebrtc/rtc_base/ip_address.cc ++++ third_party/libwebrtc/rtc_base/ip_address.cc +@@ -11,6 +11,8 @@ + #if defined(WEBRTC_POSIX) + #include + #include ++/* for u_char/u_short etc on FreeBSD 12 */ ++#include + + #include "absl/strings/string_view.h" + #ifdef OPENBSD diff --git a/www/tor-browser/files/patch-toolkit_components_tor-launcher_TorProcess_sys_mjs b/www/tor-browser/files/patch-toolkit_components_tor-launcher_TorProcess_sys_mjs new file mode 100644 index 000000000..ec2731f31 --- /dev/null +++ b/www/tor-browser/files/patch-toolkit_components_tor-launcher_TorProcess_sys_mjs @@ -0,0 +1,26 @@ +Let geoip/geoip6 file paths be set by prefs like everything else and let +the new getTorFile() deal with it. + +Index: toolkit/components/tor-launcher/TorProcess.sys.mjs +--- toolkit/components/tor-launcher/TorProcess.sys.mjs.orig ++++ toolkit/components/tor-launcher/TorProcess.sys.mjs +@@ -254,16 +254,14 @@ export class TorProcess { + "torrc-defaults", + false + ); +- // The geoip and geoip6 files are in the same directory as torrc-defaults. +- const geoipFile = torrcDefaultsFile.clone(); +- geoipFile.leafName = "geoip"; +- const geoip6File = torrcDefaultsFile.clone(); +- geoip6File.leafName = "geoip6"; ++ const geoipFile = lazy.TorLauncherUtil.getTorFile("geoip", false); ++ const geoip6File = lazy.TorLauncherUtil.getTorFile("geoip6", false); + + this.#args = []; + if (torrcDefaultsFile) { + this.#args.push("--defaults-torrc", torrcDefaultsFile.path); + } ++ this.#args.push("--ignore-missing-torrc"); + this.#args.push("-f", torrcFile.path); + this.#args.push("DataDirectory", this.#dataDir.path); + this.#args.push("ClientOnionAuthDir", onionAuthDir.path); diff --git a/www/tor-browser/files/patch-toolkit_compononents_tor-launcher_TorLauncherUtil.jsm b/www/tor-browser/files/patch-toolkit_compononents_tor-launcher_TorLauncherUtil.jsm deleted file mode 100644 index 776e8f48c..000000000 --- a/www/tor-browser/files/patch-toolkit_compononents_tor-launcher_TorLauncherUtil.jsm +++ /dev/null @@ -1,20 +0,0 @@ ---- ./toolkit/components/tor-launcher/TorLauncherUtil.jsm.orig 2022-12-12 08:48:18.438560000 +0000 -+++ ./toolkit/components/tor-launcher/TorLauncherUtil.jsm 2022-12-12 08:49:39.039184000 +0000 -@@ -31,7 +31,7 @@ - checkIPCPathLen = true; - - static _isFirstIPCPathRequest = true; -- static _isUserDataOutsideOfAppDir = undefined; -+ static _isUserDataOutsideOfAppDir = true; - static _dataDir = null; - static _appDir = null; - -@@ -340,7 +340,7 @@ - static get dataDir() { - if (!this._dataDir) { - const profDir = Services.dirsvc.get("ProfD", Ci.nsIFile); -- this._dataDir = profDir.parent.parent; -+ this._dataDir = profDir; - } - return this._dataDir; - } diff --git a/www/tor-browser/files/patch-toolkit_compononents_tor-launcher_TorProcess.jsm b/www/tor-browser/files/patch-toolkit_compononents_tor-launcher_TorProcess.jsm deleted file mode 100644 index b8dd2ecb2..000000000 --- a/www/tor-browser/files/patch-toolkit_compononents_tor-launcher_TorProcess.jsm +++ /dev/null @@ -1,22 +0,0 @@ ---- ./toolkit/components/tor-launcher/TorProcess.jsm.orig 2022-12-12 13:13:52.306244000 +0100 -+++ ./toolkit/components/tor-launcher/TorProcess.jsm 2022-12-12 13:14:59.887641000 +0100 -@@ -254,6 +254,8 @@ - this._dataDir = TorLauncherUtil.getTorFile("tordatadir", true); - const onionAuthDir = TorLauncherUtil.getTorFile("toronionauthdir", true); - const hashedPassword = TorProtocolService.torGetPassword(true); -+ const geoipFile = TorLauncherUtil.getTorFile("geoip", false); -+ const geoip6File = TorLauncherUtil.getTorFile("geoip6", false); - let detailsKey; - if (!this._exeFile) { - detailsKey = "tor_missing"; -@@ -282,10 +284,6 @@ - false - ); - // The geoip and geoip6 files are in the same directory as torrc-defaults. -- const geoipFile = torrcDefaultsFile.clone(); -- geoipFile.leafName = "geoip"; -- const geoip6File = torrcDefaultsFile.clone(); -- geoip6File.leafName = "geoip6"; - - this._args = []; - if (torrcDefaultsFile) { diff --git a/www/tor-browser/files/patch-toolkit_torbutton_jar.mn b/www/tor-browser/files/patch-toolkit_torbutton_jar.mn new file mode 100644 index 000000000..f3a15f3c5 --- /dev/null +++ b/www/tor-browser/files/patch-toolkit_torbutton_jar.mn @@ -0,0 +1,80 @@ +--- toolkit/torbutton/jar.mn.orig 2023-11-06 01:20:34.330541000 +0100 ++++ toolkit/torbutton/jar.mn 2023-11-06 01:25:07.776233000 +0100 +@@ -13,3 +13,77 @@ + + % locale torbutton en-US %locale/en-US/ + locale/en-US/ (chrome/locale/en-US/*) ++% locale torbutton ar %locale/ar/ ++ locale/ar/ (chrome/locale/ar/*) ++% locale torbutton ca %locale/ca/ ++ locale/ca/ (chrome/locale/ca/*) ++% locale torbutton cs %locale/cs/ ++ locale/cs/ (chrome/locale/cs/*) ++% locale torbutton da %locale/da/ ++ locale/da/ (chrome/locale/da/*) ++% locale torbutton de %locale/de/ ++ locale/de/ (chrome/locale/de/*) ++% locale torbutton el %locale/el/ ++ locale/el/ (chrome/locale/el/*) ++% locale torbutton es-ES %locale/es-ES/ ++ locale/es-ES/ (chrome/locale/es-ES/*) ++% locale torbutton fa %locale/fa/ ++ locale/fa/ (chrome/locale/fa/*) ++% locale torbutton fi %locale/fi/ ++ locale/fi/ (chrome/locale/fi/*) ++% locale torbutton fr %locale/fr/ ++ locale/fr/ (chrome/locale/fr/*) ++% locale torbutton ga-IE %locale/ga-IE/ ++ locale/ga-IE/ (chrome/locale/ga-IE/*) ++% locale torbutton he %locale/he/ ++ locale/he/ (chrome/locale/he/*) ++% locale torbutton hu %locale/hu/ ++ locale/hu/ (chrome/locale/hu/*) ++% locale torbutton id %locale/id/ ++ locale/id/ (chrome/locale/id/*) ++% locale torbutton is %locale/is/ ++ locale/is/ (chrome/locale/is/*) ++% locale torbutton it %locale/it/ ++ locale/it/ (chrome/locale/it/*) ++% locale torbutton ja %locale/ja/ ++ locale/ja/ (chrome/locale/ja/*) ++% locale torbutton ka %locale/ka/ ++ locale/ka/ (chrome/locale/ka/*) ++% locale torbutton ko %locale/ko/ ++ locale/ko/ (chrome/locale/ko/*) ++% locale torbutton lt %locale/lt/ ++ locale/lt/ (chrome/locale/lt/*) ++% locale torbutton mk %locale/mk/ ++ locale/mk/ (chrome/locale/mk/*) ++% locale torbutton ms %locale/ms/ ++ locale/ms/ (chrome/locale/ms/*) ++% locale torbutton my %locale/my/ ++ locale/my/ (chrome/locale/my/*) ++% locale torbutton nb-NO %locale/nb-NO/ ++ locale/nb-NO/ (chrome/locale/nb-NO/*) ++% locale torbutton nl %locale/nl/ ++ locale/nl/ (chrome/locale/nl/*) ++% locale torbutton pl %locale/pl/ ++ locale/pl/ (chrome/locale/pl/*) ++% locale torbutton pt-BR %locale/pt-BR/ ++ locale/pt-BR/ (chrome/locale/pt-BR/*) ++% locale torbutton ro %locale/ro/ ++ locale/ro/ (chrome/locale/ro/*) ++% locale torbutton ru %locale/ru/ ++ locale/ru/ (chrome/locale/ru/*) ++% locale torbutton sq %locale/sq/ ++ locale/sq/ (chrome/locale/sq/*) ++% locale torbutton sv-SE %locale/sv-SE/ ++ locale/sv-SE/ (chrome/locale/sv-SE/*) ++% locale torbutton th %locale/th/ ++ locale/th/ (chrome/locale/th/*) ++% locale torbutton tr %locale/tr/ ++ locale/tr/ (chrome/locale/tr/*) ++% locale torbutton uk %locale/uk/ ++ locale/uk/ (chrome/locale/uk/*) ++% locale torbutton vi %locale/vi/ ++ locale/vi/ (chrome/locale/vi/*) ++% locale torbutton zh-CN %locale/zh-CN/ ++ locale/zh-CN/ (chrome/locale/zh-CN/*) ++% locale torbutton zh-TW %locale/zh-TW/ ++ locale/zh-TW/ (chrome/locale/zh-TW/*) diff --git a/www/tor-browser/files/patch-toolkit_xre_glxtest.cpp b/www/tor-browser/files/patch-toolkit_xre_glxtest.cpp new file mode 100644 index 000000000..a054f2032 --- /dev/null +++ b/www/tor-browser/files/patch-toolkit_xre_glxtest.cpp @@ -0,0 +1,17 @@ +--- toolkit/xre/glxtest/glxtest.cpp.orig 2023-05-28 22:08:21.663847000 +0200 ++++ toolkit/xre/glxtest/glxtest.cpp 2023-05-28 22:09:33.647075000 +0200 +@@ -195,9 +195,14 @@ + static void get_pci_status() { + log("GLX_TEST: get_pci_status start\n"); + ++#if defined(__FreeBSD__) ++ if (access("/dev/pci", F_OK) != 0) { ++ record_warning("cannot access /dev/pci"); ++#else + if (access("/sys/bus/pci/", F_OK) != 0 && + access("/sys/bus/pci_express/", F_OK) != 0) { + record_warning("cannot access /sys/bus/pci"); ++#endif + return; + } + diff --git a/www/tor-browser/files/patch-toolkit_xre_nsXREDirPRovider.cpp b/www/tor-browser/files/patch-toolkit_xre_nsXREDirPRovider.cpp deleted file mode 100644 index b57ba700f..000000000 --- a/www/tor-browser/files/patch-toolkit_xre_nsXREDirPRovider.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- toolkit/xre/nsXREDirProvider.cpp.orig 2023-01-15 10:55:50.058634000 +0100 -+++ toolkit/xre/nsXREDirProvider.cpp 2023-01-15 10:56:48.735300000 +0100 -@@ -1653,7 +1653,11 @@ - ToLowerCase(folder); - - rv = AppendProfileString(aFile, folder.BeginReading()); -+ } else { -+ nsAutoCString folder(".tor-browser-profiles"); -+ rv = aFile->AppendNative(folder); - } -+ - NS_ENSURE_SUCCESS(rv, rv); - - #else