Attachment 191460 Details for Bug 226476 – beta3

[patch] beta3

ff60.diff (text/plain), 433.92 KB, created by Jan Beich on 2018-03-13 01:04:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2018-03-13 01:04:32 UTC

Size: 433.92 KB

patch

obsolete

>From c095d454a0d2dfc35ba85156f2d5ab84c93ec22c Mon Sep 17 00:00:00 2001
>From: jbeich <jbeich@35697150-7ecd-e111-bb59-0022644237b5>
>Date: Tue, 6 Mar 2018 00:56:50 +0000
>Subject: [PATCH] www/firefox: update to 60.0
>
>- Drop libv4l support to reduce maintenance
>
>Changes:	https://www.mozilla.org/firefox/60.0/releasenotes/
>PR:		226476
>Tested by:	?
>Security:	5aefc41e-d304-4ec8-8c82-824f84f08244
>MFH:		2018Q2
>---
> Mk/Uses/gecko.mk                    |     4 +-
> Mk/bsd.gecko.mk                     |     2 +-
> www/firefox-i18n/Makefile           |     5 +-
> www/firefox-i18n/Makefile.lang      |     5 +-
> www/firefox-i18n/Makefile.option    |     2 +
> www/firefox-i18n/distinfo           |   392 +-
> www/firefox/Makefile                |    19 +-
> www/firefox/distinfo                |     6 +-
> www/firefox/files/patch-bug1021761  |     6 +-
> www/firefox/files/patch-bug1418162  |    58 +
> www/firefox/files/patch-bug1433747  |    24 -
> www/firefox/files/patch-bug1437670  | 11036 ++++++++++++++++++++++++++++++++++
> www/firefox/files/patch-bug1442791  |    33 +
> www/firefox/files/patch-bug1444074  |    34 -
> www/firefox/files/patch-bug1444083  |    17 -
> www/firefox/files/patch-bug826985   |   171 -
> www/firefox/files/patch-z-bug517422 |    24 +-
> 17 files changed, 11361 insertions(+), 477 deletions(-)
> create mode 100644 www/firefox/files/patch-bug1418162
> delete mode 100644 www/firefox/files/patch-bug1433747
> create mode 100644 www/firefox/files/patch-bug1437670
> create mode 100644 www/firefox/files/patch-bug1442791
> delete mode 100644 www/firefox/files/patch-bug1444074
> delete mode 100644 www/firefox/files/patch-bug1444083
> delete mode 100644 www/firefox/files/patch-bug826985
>
>diff --git a/Mk/Uses/gecko.mk b/Mk/Uses/gecko.mk
>index d07d0a07c4fe..9df59c251201 100644
>--- a/Mk/Uses/gecko.mk
>+++ b/Mk/Uses/gecko.mk
>@@ -37,12 +37,12 @@ RUN_DEPENDS+=	libxul>=45:www/libxul
> .elif ${gecko_ARGS:Mfirefox}
> 
> _GECKO_DEFAULT_VERSION=	52
>-_GECKO_VERSIONS=		52 59
>+_GECKO_VERSIONS=		52 60
> _GECKO_TYPE=	firefox
> 
> # Dependence lines for different Firefox versions
> 52_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox-esr
>-59_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox
>+60_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox
> 
> .if exists(${LOCALBASE}/bin/firefox)
> _GECKO_INSTALLED_VER!=	${LOCALBASE}/bin/firefox --version 2>/dev/null
>diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
>index e7cabd965629..3479bf23ddf3 100644
>--- a/Mk/bsd.gecko.mk
>+++ b/Mk/bsd.gecko.mk
>@@ -383,7 +383,7 @@ post-patch-SNDIO-on:
> .endif
> 
> .if ${PORT_OPTIONS:MRUST} || ${MOZILLA_VER:R:R} >= 54
>-BUILD_DEPENDS+=	${RUST_PORT:T}>=1.22.1:${RUST_PORT}
>+BUILD_DEPENDS+=	${RUST_PORT:T}>=1.24:${RUST_PORT}
> RUST_PORT?=		lang/rust
> . if ${MOZILLA_VER:R:R} < 54
> MOZ_OPTIONS+=	--enable-rust
>diff --git a/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile
>index beb3e0f88e49..af06ba80fb26 100644
>--- a/www/firefox-i18n/Makefile
>+++ b/www/firefox-i18n/Makefile
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	firefox-i18n
>-PORTVERSION=	59.0
>-PORTREVISION=	2
>+PORTVERSION=	60.0b3
> CATEGORIES=	www
> MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \
> 		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build5/linux-i686/xpi
>@@ -16,7 +15,7 @@ COMMENT=	Localized interface for Firefox
> 
> EXTRACT_DEPENDS=	zip:archivers/zip
> 
>-USES=		zip:infozip gecko:firefox,59,build
>+USES=		zip:infozip gecko:firefox,60,build
> USE_XPI=	firefox
> 
> NO_ARCH=	yes
>diff --git a/www/firefox-i18n/Makefile.lang b/www/firefox-i18n/Makefile.lang
>index a73f94452926..25b432860d28 100644
>--- a/www/firefox-i18n/Makefile.lang
>+++ b/www/firefox-i18n/Makefile.lang
>@@ -6,7 +6,7 @@ FIREFOX_I18N_ALL_=	ach af an ar as ast az be bg bn-BD bn-IN br bs ca cak	\
> 			es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn	\
> 			gu-IN he hi-IN hr hsb hu hy-AM ia id is it ja ka kab	\
> 			kk km kn ko lij lt lv mai mk ml mr ms my nb-NO ne-NP nl	\
>-			nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son	\
>+			nn-NO oc or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son	\
> 			sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW
> 
> .if defined(FIREFOX_I18N_ALL) || defined(PACKAGE_BUILDING) || target(package)
>@@ -225,6 +225,9 @@ FIREFOX_I18N+=  nl
> .if ${PORT_OPTIONS:MLANG_NN}
> FIREFOX_I18N+=  nn-NO
> .endif
>+.if ${PORT_OPTIONS:MLANG_OC}
>+FIREFOX_I18N+=  oc
>+.endif
> .if ${PORT_OPTIONS:MLANG_OR}
> FIREFOX_I18N+=  or
> .endif
>diff --git a/www/firefox-i18n/Makefile.option b/www/firefox-i18n/Makefile.option
>index 082aa76465ba..49e0d6f4adc6 100644
>--- a/www/firefox-i18n/Makefile.option
>+++ b/www/firefox-i18n/Makefile.option
>@@ -73,6 +73,7 @@ OPTIONS_DEFINE=	LANG_ACH \
> 		LANG_NE \
> 		LANG_NL \
> 		LANG_NN \
>+		LANG_OC \
> 		LANG_OR \
> 		LANG_PA \
> 		LANG_PL \
>@@ -122,6 +123,7 @@ LANG_LIJ_DESC?=	Ligurian (Genoa) language support
> LANG_MS_DESC?=	Malay language support
> LANG_MY_DESC?=	Burmese language support
> LANG_NE_DESC?=	Nepali language support
>+LANG_OC_DESC?=	Occitan (lengadocian) language support
> LANG_SW_DESC?=	Swahili language support
> LANG_UR_DESC?=	Urdu (Pakistan) language support
> LANG_UZ_DESC?=	Uzbek language support
>diff --git a/www/firefox-i18n/distinfo b/www/firefox-i18n/distinfo
>index f6e5d4114454..f9165dd3f6d5 100644
>--- a/www/firefox-i18n/distinfo
>+++ b/www/firefox-i18n/distinfo
>@@ -1,195 +1,197 @@
>-TIMESTAMP = 1520650457
>-SHA256 (xpi/firefox-i18n-59.0/ach.xpi) = 1d3c6166b27b5e640733210faf4e7fa751d1acb8edd80448fd5cfb840c491987
>-SIZE (xpi/firefox-i18n-59.0/ach.xpi) = 439224
>-SHA256 (xpi/firefox-i18n-59.0/af.xpi) = 21ef31da94eb74b269e65c47961f93d17827a480756d282cf367f3ec4998866c
>-SIZE (xpi/firefox-i18n-59.0/af.xpi) = 436729
>-SHA256 (xpi/firefox-i18n-59.0/an.xpi) = e544fcac272f5b3ee9365c53063164fb6f93e323c61fb0154e744fe046d0e348
>-SIZE (xpi/firefox-i18n-59.0/an.xpi) = 463403
>-SHA256 (xpi/firefox-i18n-59.0/ar.xpi) = 6443febaa553ae1f843a20ca5c78be7db122ffa98289f100cca883c86b17fb0a
>-SIZE (xpi/firefox-i18n-59.0/ar.xpi) = 486631
>-SHA256 (xpi/firefox-i18n-59.0/as.xpi) = b8baf8448a59e13ae8ed5794f9a1b796f34029add488dc215023ff12c5549ccb
>-SIZE (xpi/firefox-i18n-59.0/as.xpi) = 483300
>-SHA256 (xpi/firefox-i18n-59.0/ast.xpi) = 82876aa720ab6c98c5c1dd12fde7d62a47d1c42a87d70666b765144e620334e2
>-SIZE (xpi/firefox-i18n-59.0/ast.xpi) = 454341
>-SHA256 (xpi/firefox-i18n-59.0/az.xpi) = e799b35e4a8d2272378b6f0fadee5777660af8d96e6cfa9b23d5d4e3a7088693
>-SIZE (xpi/firefox-i18n-59.0/az.xpi) = 464267
>-SHA256 (xpi/firefox-i18n-59.0/be.xpi) = d4852d209ee8dfa9b88abc418f48cbb4df9599de9c4000455f50533ddc1dba08
>-SIZE (xpi/firefox-i18n-59.0/be.xpi) = 517058
>-SHA256 (xpi/firefox-i18n-59.0/bg.xpi) = ee011edf65e91faa21c8a75b8f9922484a899b4d6762f0a6a5f3b9f35521c2b3
>-SIZE (xpi/firefox-i18n-59.0/bg.xpi) = 508611
>-SHA256 (xpi/firefox-i18n-59.0/bn-BD.xpi) = 5c39189efa5daf9e8d6574b98bed66edad98bd0a4459955c666c5a9734c16d28
>-SIZE (xpi/firefox-i18n-59.0/bn-BD.xpi) = 526351
>-SHA256 (xpi/firefox-i18n-59.0/bn-IN.xpi) = cdacc3c3002f4bb335b13bea1ddf22d0725938156afe257d45ad1a2e1148aa68
>-SIZE (xpi/firefox-i18n-59.0/bn-IN.xpi) = 510795
>-SHA256 (xpi/firefox-i18n-59.0/br.xpi) = dfa4af49f1c379c1e299d252ba416310775c0f6a5802b1f26bb6610e20ab890d
>-SIZE (xpi/firefox-i18n-59.0/br.xpi) = 451718
>-SHA256 (xpi/firefox-i18n-59.0/bs.xpi) = 75b095a9128248737edcb22a5c7926c51f1657762549453fe5dba045628baa97
>-SIZE (xpi/firefox-i18n-59.0/bs.xpi) = 457857
>-SHA256 (xpi/firefox-i18n-59.0/ca.xpi) = 5171bf8d0c0f40bea63e81ae282cd41e42484b2ec06b904460c8669ee6454a3b
>-SIZE (xpi/firefox-i18n-59.0/ca.xpi) = 464910
>-SHA256 (xpi/firefox-i18n-59.0/cak.xpi) = eaae22a1be95e28d55aa849dc3699ebe5ee567574e38a306f26591da03a7e332
>-SIZE (xpi/firefox-i18n-59.0/cak.xpi) = 475232
>-SHA256 (xpi/firefox-i18n-59.0/cs.xpi) = 2843a427be283937c15f98e31cb23025960822a8faf0d71d7ef30e20007cecae
>-SIZE (xpi/firefox-i18n-59.0/cs.xpi) = 471573
>-SHA256 (xpi/firefox-i18n-59.0/cy.xpi) = 9e83160f6142bc1189822957f7528f1a3ca4c221576cac1075dfed5731197516
>-SIZE (xpi/firefox-i18n-59.0/cy.xpi) = 454431
>-SHA256 (xpi/firefox-i18n-59.0/da.xpi) = 5803ba7d12156ef86fcc951ceac1b53f3fbce938826d51bc6f15780c1242d935
>-SIZE (xpi/firefox-i18n-59.0/da.xpi) = 446947
>-SHA256 (xpi/firefox-i18n-59.0/de.xpi) = 80cb4b481073f71acaa6e6d760ebf0b599a33895eab236cf2cc3a8c000be0697
>-SIZE (xpi/firefox-i18n-59.0/de.xpi) = 466271
>-SHA256 (xpi/firefox-i18n-59.0/dsb.xpi) = bcdb45e97f901fbff9b547a91a0b5c2a5bdadeea8ea5610ee5fceaf4484ef36f
>-SIZE (xpi/firefox-i18n-59.0/dsb.xpi) = 478973
>-SHA256 (xpi/firefox-i18n-59.0/el.xpi) = 466c2fef631c844ab1280e3879add57aacb98e2f30a7d8223f865d196deeb487
>-SIZE (xpi/firefox-i18n-59.0/el.xpi) = 531406
>-SHA256 (xpi/firefox-i18n-59.0/en-GB.xpi) = cb42b3e458acc5ab249da6b55a9958585e4c064ddfb94b7bf49f9465626df0a4
>-SIZE (xpi/firefox-i18n-59.0/en-GB.xpi) = 434298
>-SHA256 (xpi/firefox-i18n-59.0/en-US.xpi) = d7a323080afc9cf936cf672e584da825413637b4b413153b0f4ddd5169fdf05a
>-SIZE (xpi/firefox-i18n-59.0/en-US.xpi) = 432747
>-SHA256 (xpi/firefox-i18n-59.0/en-ZA.xpi) = 4816897d2e2f2f5f3d3a35a0f335cd34673f4cc57fe82178af7522055b508e9b
>-SIZE (xpi/firefox-i18n-59.0/en-ZA.xpi) = 427364
>-SHA256 (xpi/firefox-i18n-59.0/eo.xpi) = c17ce4751c46e83a293d7272ca8cfeff8602b223226d8fb60aab74e9dae5e7ad
>-SIZE (xpi/firefox-i18n-59.0/eo.xpi) = 453365
>-SHA256 (xpi/firefox-i18n-59.0/es-AR.xpi) = 1a51d27cafa512ee25f9738f3b121f8d7e573ba277d1b834bae30a739c851e03
>-SIZE (xpi/firefox-i18n-59.0/es-AR.xpi) = 461795
>-SHA256 (xpi/firefox-i18n-59.0/es-CL.xpi) = f6c73332ed4ad8484aee9c87b70762ebf4795fbf340d87ee763879eb20788d14
>-SIZE (xpi/firefox-i18n-59.0/es-CL.xpi) = 464652
>-SHA256 (xpi/firefox-i18n-59.0/es-ES.xpi) = c1fc12302f57f526ef483ffb79a39c63b0f946b09fd1541989dd2b28ba7eb83c
>-SIZE (xpi/firefox-i18n-59.0/es-ES.xpi) = 348462
>-SHA256 (xpi/firefox-i18n-59.0/es-MX.xpi) = 208182f94525a759cba128b892e80e99ee6dd1921906f8c054a8a515e283b35a
>-SIZE (xpi/firefox-i18n-59.0/es-MX.xpi) = 466310
>-SHA256 (xpi/firefox-i18n-59.0/et.xpi) = 0414fc474c1457f8ec64a40d3f268aefe8ddc70cf85a07c5faba4b156f04353c
>-SIZE (xpi/firefox-i18n-59.0/et.xpi) = 445393
>-SHA256 (xpi/firefox-i18n-59.0/eu.xpi) = 45a5df206d635e4b656c34e06e2c7df4b5614fd1584e7bd171432bff44cf155c
>-SIZE (xpi/firefox-i18n-59.0/eu.xpi) = 455235
>-SHA256 (xpi/firefox-i18n-59.0/fa.xpi) = 375f9c9356891978d1b8558c63e34675ff3ed70dde54cbd70fbfee736a6dbe37
>-SIZE (xpi/firefox-i18n-59.0/fa.xpi) = 508096
>-SHA256 (xpi/firefox-i18n-59.0/ff.xpi) = ef8313cd46c2e68af5388d4c705958db8e2b75c4156b2b5ee76b2822c5bb921e
>-SIZE (xpi/firefox-i18n-59.0/ff.xpi) = 455025
>-SHA256 (xpi/firefox-i18n-59.0/fi.xpi) = 2d568720cd7f1d3106c6e1c8d02e838786a7643cdc8a74362a449127636346b6
>-SIZE (xpi/firefox-i18n-59.0/fi.xpi) = 445181
>-SHA256 (xpi/firefox-i18n-59.0/fr.xpi) = 7dad72da0d5ea4d30b70f34319a9446044d952bcdcaef8e50e8735328f86e857
>-SIZE (xpi/firefox-i18n-59.0/fr.xpi) = 473591
>-SHA256 (xpi/firefox-i18n-59.0/fy-NL.xpi) = d1595e13a228471d0e675148d52855d0f18fb0352ac559323204dfa648233b44
>-SIZE (xpi/firefox-i18n-59.0/fy-NL.xpi) = 462917
>-SHA256 (xpi/firefox-i18n-59.0/ga-IE.xpi) = 21c43c03c285a53f47a56be397dafed998b60fdc763d370465f692d90ba967b1
>-SIZE (xpi/firefox-i18n-59.0/ga-IE.xpi) = 471906
>-SHA256 (xpi/firefox-i18n-59.0/gd.xpi) = 0ecf7b654d8ab199277c286849bc50e4289c30b7766e3a9de28a69cafa75aa6b
>-SIZE (xpi/firefox-i18n-59.0/gd.xpi) = 461296
>-SHA256 (xpi/firefox-i18n-59.0/gl.xpi) = eddfdf159b7dc97c2ab00d5c13208fb161521cbeeaefbcabd3925f68fd28db0a
>-SIZE (xpi/firefox-i18n-59.0/gl.xpi) = 441613
>-SHA256 (xpi/firefox-i18n-59.0/gn.xpi) = 14cb97943f1b501a77a843addd6b03c60518c8c30fb7337148f1803c492f91ad
>-SIZE (xpi/firefox-i18n-59.0/gn.xpi) = 469396
>-SHA256 (xpi/firefox-i18n-59.0/gu-IN.xpi) = 3ffc20afbe2ad5a625079766ac286cb19f1052e874e3825169619364f8c843ba
>-SIZE (xpi/firefox-i18n-59.0/gu-IN.xpi) = 521802
>-SHA256 (xpi/firefox-i18n-59.0/he.xpi) = 89ba85e80cf52e7743763804300a8b2e9c5e55b9d189954cf5d45c796ea77c04
>-SIZE (xpi/firefox-i18n-59.0/he.xpi) = 472769
>-SHA256 (xpi/firefox-i18n-59.0/hi-IN.xpi) = 16a5e4fbbf1ddd8827afb2382b82b59039fb040b16bd36f9c214ddaa4bd82db0
>-SIZE (xpi/firefox-i18n-59.0/hi-IN.xpi) = 524277
>-SHA256 (xpi/firefox-i18n-59.0/hr.xpi) = 2966dafaea8224e7e9e599f048fb9725f28704af53bb5f0a311dc9ef485f7325
>-SIZE (xpi/firefox-i18n-59.0/hr.xpi) = 459976
>-SHA256 (xpi/firefox-i18n-59.0/hsb.xpi) = 1311fdfe6784f73c1f7ead834a301e8818db253393510a0f6bc00e68ec5e4546
>-SIZE (xpi/firefox-i18n-59.0/hsb.xpi) = 475939
>-SHA256 (xpi/firefox-i18n-59.0/hu.xpi) = c362521efa6a58d80eff294bd1d85939c42c6a29cbba6903a3d00525fd4ca9e0
>-SIZE (xpi/firefox-i18n-59.0/hu.xpi) = 476895
>-SHA256 (xpi/firefox-i18n-59.0/hy-AM.xpi) = 4b28fd26b21abe6897399a72c4d99c765d3b08f55a1f36c184d33bf83d646668
>-SIZE (xpi/firefox-i18n-59.0/hy-AM.xpi) = 508165
>-SHA256 (xpi/firefox-i18n-59.0/ia.xpi) = 4c7f6069edb4cfab47bad733621b23d192f4ef666556877d441f224ed5f91dd9
>-SIZE (xpi/firefox-i18n-59.0/ia.xpi) = 448827
>-SHA256 (xpi/firefox-i18n-59.0/id.xpi) = e11d14366748f021c336254f1557ca62d0bbd13ca308be097b28e68db5a8e02f
>-SIZE (xpi/firefox-i18n-59.0/id.xpi) = 441951
>-SHA256 (xpi/firefox-i18n-59.0/is.xpi) = 8bb7f3fb34c4fa15f297a99f5651f00a99844346a1d4469117c5dea0cd840843
>-SIZE (xpi/firefox-i18n-59.0/is.xpi) = 451371
>-SHA256 (xpi/firefox-i18n-59.0/it.xpi) = 619b955412cd52f1379a64f9bbc23f78d595dd0139c0097ea3e93c4267eef051
>-SIZE (xpi/firefox-i18n-59.0/it.xpi) = 342522
>-SHA256 (xpi/firefox-i18n-59.0/ja.xpi) = e32dc966b1164b0a8bc5e8efbf660d8c462c9e50c93a978de88eb3915ab41247
>-SIZE (xpi/firefox-i18n-59.0/ja.xpi) = 508146
>-SHA256 (xpi/firefox-i18n-59.0/ka.xpi) = d0cb6ec913abd01d5826032716cb12b780e591d273080972d3627ab5c51e2bbd
>-SIZE (xpi/firefox-i18n-59.0/ka.xpi) = 492567
>-SHA256 (xpi/firefox-i18n-59.0/kab.xpi) = 3b56006aa799f9c6e402781843a4774a858532c1f53ba03f5918efa52a3dabac
>-SIZE (xpi/firefox-i18n-59.0/kab.xpi) = 461838
>-SHA256 (xpi/firefox-i18n-59.0/kk.xpi) = c1bbedcb92a43c18c654b098705d513d7663876a30875c322a61657e6046b72c
>-SIZE (xpi/firefox-i18n-59.0/kk.xpi) = 517582
>-SHA256 (xpi/firefox-i18n-59.0/km.xpi) = 9fa77a9347c77f23f52f0129a35fe290bb3d67e261817956ba265f3b68cacbe4
>-SIZE (xpi/firefox-i18n-59.0/km.xpi) = 526357
>-SHA256 (xpi/firefox-i18n-59.0/kn.xpi) = b62f5139ee71ed4107e878a5fab2e58e1dd910598b85199d1162c67ffc426c85
>-SIZE (xpi/firefox-i18n-59.0/kn.xpi) = 527877
>-SHA256 (xpi/firefox-i18n-59.0/ko.xpi) = 1c498889480fa8ea9a065ba12b185283edc518d738c6db8ff780098b38bf817a
>-SIZE (xpi/firefox-i18n-59.0/ko.xpi) = 487659
>-SHA256 (xpi/firefox-i18n-59.0/lij.xpi) = 0312ca2b5aecd54f7456d8310542165f005f2e1bddc70bedb824541dcce4b65b
>-SIZE (xpi/firefox-i18n-59.0/lij.xpi) = 446604
>-SHA256 (xpi/firefox-i18n-59.0/lt.xpi) = 7ba6037547b3e5f1d402ce698cd74dfbe6c2eca8013f9ebb9cda820233cca998
>-SIZE (xpi/firefox-i18n-59.0/lt.xpi) = 475141
>-SHA256 (xpi/firefox-i18n-59.0/lv.xpi) = 85f32e9a7fd03423ae0b7339990c076b84409f95d9dc010089389666f891c1da
>-SIZE (xpi/firefox-i18n-59.0/lv.xpi) = 463653
>-SHA256 (xpi/firefox-i18n-59.0/mai.xpi) = 2cc0ec3dc2a0296d17c0fd71060291caac8981c496acc524b26da7ef4cb62ed3
>-SIZE (xpi/firefox-i18n-59.0/mai.xpi) = 499908
>-SHA256 (xpi/firefox-i18n-59.0/mk.xpi) = 0ffa52cdc876ceb990eb0b1d729ed5fa5fe92bfe2d65e9d4bfd759758ac216fa
>-SIZE (xpi/firefox-i18n-59.0/mk.xpi) = 484074
>-SHA256 (xpi/firefox-i18n-59.0/ml.xpi) = ac845dba07dbbd76fe37c0bfc4dd5365e15254971f9588377a680e07745fed6f
>-SIZE (xpi/firefox-i18n-59.0/ml.xpi) = 539733
>-SHA256 (xpi/firefox-i18n-59.0/mr.xpi) = 8bafe1760d2a1cf0093256cd019dac2c097e79f1484bfe66a1f3f73076d3b6b3
>-SIZE (xpi/firefox-i18n-59.0/mr.xpi) = 517960
>-SHA256 (xpi/firefox-i18n-59.0/ms.xpi) = 00c44f109551b23f0a904402573c06edf4d8bf087cc0e91b52b006621883c9b5
>-SIZE (xpi/firefox-i18n-59.0/ms.xpi) = 450073
>-SHA256 (xpi/firefox-i18n-59.0/my.xpi) = 37708298e5bcf83d9570a5144b633709666b69840315c680bae3f7dd2a186001
>-SIZE (xpi/firefox-i18n-59.0/my.xpi) = 511892
>-SHA256 (xpi/firefox-i18n-59.0/nb-NO.xpi) = 90c61e5724b618b5fdfc65fc37d60686cd374f94a6567d6aa290c8733eb45c86
>-SIZE (xpi/firefox-i18n-59.0/nb-NO.xpi) = 450275
>-SHA256 (xpi/firefox-i18n-59.0/ne-NP.xpi) = d6a3aebbb11faca5a07794648f13946a84807abb7325176b0da8b51e2c53f251
>-SIZE (xpi/firefox-i18n-59.0/ne-NP.xpi) = 509175
>-SHA256 (xpi/firefox-i18n-59.0/nl.xpi) = 95cdc03247c2e59313c59bf819401fcf140bcf556367755f79207ce38345c123
>-SIZE (xpi/firefox-i18n-59.0/nl.xpi) = 458127
>-SHA256 (xpi/firefox-i18n-59.0/nn-NO.xpi) = 87fa01ddab0d6545cced17229187b63bead047549ea7c73ba3947f9a555a8dd7
>-SIZE (xpi/firefox-i18n-59.0/nn-NO.xpi) = 451469
>-SHA256 (xpi/firefox-i18n-59.0/or.xpi) = a00da5f2a4b7c13947a27b526c0d35673eff42d9cab0979c6670ca54ee8f68c7
>-SIZE (xpi/firefox-i18n-59.0/or.xpi) = 493180
>-SHA256 (xpi/firefox-i18n-59.0/pa-IN.xpi) = e43dd78383255b594d8078c38d46e872565304427ab7bbeca47458477a34d4ef
>-SIZE (xpi/firefox-i18n-59.0/pa-IN.xpi) = 492418
>-SHA256 (xpi/firefox-i18n-59.0/pl.xpi) = 323c5439304f6fbed7db49ae96ab513071551ef87e12bc11103b5b4be0d07289
>-SIZE (xpi/firefox-i18n-59.0/pl.xpi) = 358509
>-SHA256 (xpi/firefox-i18n-59.0/pt-BR.xpi) = 21bde4b1666858fb65682147fa235fe9688206a2e0d492affd019b3fd99e2c64
>-SIZE (xpi/firefox-i18n-59.0/pt-BR.xpi) = 455913
>-SHA256 (xpi/firefox-i18n-59.0/pt-PT.xpi) = d9008a9b59a265702ad5915149fa9960151bdd0699bafaf8c383ece97d182d9f
>-SIZE (xpi/firefox-i18n-59.0/pt-PT.xpi) = 459329
>-SHA256 (xpi/firefox-i18n-59.0/rm.xpi) = 88192d2d2b3824d45ff862ba285ce36499ae15daaf89d21037a8ebfc0500fe61
>-SIZE (xpi/firefox-i18n-59.0/rm.xpi) = 449756
>-SHA256 (xpi/firefox-i18n-59.0/ro.xpi) = 6fe642ecbb2d3f2c181fc8f1194c1b08cf1d6d1f76b8f205ffdfbab650f8827a
>-SIZE (xpi/firefox-i18n-59.0/ro.xpi) = 453401
>-SHA256 (xpi/firefox-i18n-59.0/ru.xpi) = 9905c2249e72bf8be629c59915298598ac6e63b90ba95ceee0795d077a4ad09b
>-SIZE (xpi/firefox-i18n-59.0/ru.xpi) = 526521
>-SHA256 (xpi/firefox-i18n-59.0/si.xpi) = 9608ae50405741a544270d2256035a8ae6484767fe737db8b98ac296ccdcda67
>-SIZE (xpi/firefox-i18n-59.0/si.xpi) = 492585
>-SHA256 (xpi/firefox-i18n-59.0/sk.xpi) = ee8cc67c33edccc7b7291496fb20f2f850f6934f67a0694b1bb19774db254eb1
>-SIZE (xpi/firefox-i18n-59.0/sk.xpi) = 480811
>-SHA256 (xpi/firefox-i18n-59.0/sl.xpi) = 13a9308e3d93ecfb873f4fb9a4a6f14b77ac37a730c0700e7c0296ab81250de7
>-SIZE (xpi/firefox-i18n-59.0/sl.xpi) = 458823
>-SHA256 (xpi/firefox-i18n-59.0/son.xpi) = 557087d226148a636c89313de04b7dfad71bca392dde28236163ca556f9322be
>-SIZE (xpi/firefox-i18n-59.0/son.xpi) = 446398
>-SHA256 (xpi/firefox-i18n-59.0/sq.xpi) = 492cbf457ad02ef8efdfc546207a2d6c9ea07df57741dcebf89bae235438ca55
>-SIZE (xpi/firefox-i18n-59.0/sq.xpi) = 464461
>-SHA256 (xpi/firefox-i18n-59.0/sr.xpi) = 30dc2cc54bd0bb4c88bd4ec016eba9285fc1d14d27417b402c2a44967baa4fd5
>-SIZE (xpi/firefox-i18n-59.0/sr.xpi) = 486176
>-SHA256 (xpi/firefox-i18n-59.0/sv-SE.xpi) = 69fc218bcf153772dbeb1000dc35849210d00ede91537b948b27876ec03ffddf
>-SIZE (xpi/firefox-i18n-59.0/sv-SE.xpi) = 458658
>-SHA256 (xpi/firefox-i18n-59.0/ta.xpi) = d55bc8f1458d96d548d7ef3e01a1cec3dbd9c4b62f8dd539658d4ad90129fb58
>-SIZE (xpi/firefox-i18n-59.0/ta.xpi) = 512841
>-SHA256 (xpi/firefox-i18n-59.0/te.xpi) = 25368ecdd33ed9ec4ad5fd95f510afffc61740f2bbb33c814ec3a6863673dc39
>-SIZE (xpi/firefox-i18n-59.0/te.xpi) = 527082
>-SHA256 (xpi/firefox-i18n-59.0/th.xpi) = a7e8951f27666735eb6e2bb526c069ae26a7bf6ed2dde12c0b47a9adacc1c200
>-SIZE (xpi/firefox-i18n-59.0/th.xpi) = 498542
>-SHA256 (xpi/firefox-i18n-59.0/tr.xpi) = 50728d089f891362a4b1f0d036edbc556e8dbe922c2abdbb89ffe45d57d275f4
>-SIZE (xpi/firefox-i18n-59.0/tr.xpi) = 463592
>-SHA256 (xpi/firefox-i18n-59.0/uk.xpi) = 7b500089a303e93761054b3cda4e4a188ebe6ccc2a120e5c90fd5d4e7cf28cfe
>-SIZE (xpi/firefox-i18n-59.0/uk.xpi) = 516924
>-SHA256 (xpi/firefox-i18n-59.0/ur.xpi) = 9cc9ece7f94e13894651b4c342d226552e8544e8488e447da6c9f1ddf8884d31
>-SIZE (xpi/firefox-i18n-59.0/ur.xpi) = 507378
>-SHA256 (xpi/firefox-i18n-59.0/uz.xpi) = 4ae7546f790afe6b931d137531a6ef6a7287f1959ed20758c62624e23d75fa53
>-SIZE (xpi/firefox-i18n-59.0/uz.xpi) = 456922
>-SHA256 (xpi/firefox-i18n-59.0/vi.xpi) = 778ee06852609372e0303a5354b6e8b1f2a22e999cbeedba6bf9d8d303c05bf9
>-SIZE (xpi/firefox-i18n-59.0/vi.xpi) = 470067
>-SHA256 (xpi/firefox-i18n-59.0/xh.xpi) = 41dfddbd064d2da408b93409bfacafd32226cd086a3da5e603a5a3fba4891656
>-SIZE (xpi/firefox-i18n-59.0/xh.xpi) = 460770
>-SHA256 (xpi/firefox-i18n-59.0/zh-CN.xpi) = 03679d815dee18016aae33fba44eafe8116d025c5f5d99b9efbba29d65886b8f
>-SIZE (xpi/firefox-i18n-59.0/zh-CN.xpi) = 483447
>-SHA256 (xpi/firefox-i18n-59.0/zh-TW.xpi) = 40253d142f875a27e086c34737e0c437939cea29011160c7d7b252ad1f34f9d2
>-SIZE (xpi/firefox-i18n-59.0/zh-TW.xpi) = 477087
>+TIMESTAMP = 1520868062
>+SHA256 (xpi/firefox-i18n-60.0b3/ach.xpi) = 93907879b5b6ffdde334dae1759e2892b4d3eb31ef0530a584115a6173b5beac
>+SIZE (xpi/firefox-i18n-60.0b3/ach.xpi) = 447326
>+SHA256 (xpi/firefox-i18n-60.0b3/af.xpi) = c9b3906996d8d9a696b7a4efdce96193733deeaae74f3e63cdf5d5c4fbcdfcae
>+SIZE (xpi/firefox-i18n-60.0b3/af.xpi) = 444620
>+SHA256 (xpi/firefox-i18n-60.0b3/an.xpi) = 1513e0d38c53947660119493fd06513efaa329e6460a954bb33b8fe3c3b893da
>+SIZE (xpi/firefox-i18n-60.0b3/an.xpi) = 470859
>+SHA256 (xpi/firefox-i18n-60.0b3/ar.xpi) = cce6181c402d09e5b8aa33672ad9f87b8cf717ecb974eb81240a4ee9fae7d736
>+SIZE (xpi/firefox-i18n-60.0b3/ar.xpi) = 494960
>+SHA256 (xpi/firefox-i18n-60.0b3/as.xpi) = a0e37fa706606d07b0378c78eec35e6f2a850988ea31c21e5d1561052f44a730
>+SIZE (xpi/firefox-i18n-60.0b3/as.xpi) = 488392
>+SHA256 (xpi/firefox-i18n-60.0b3/ast.xpi) = 4ed5576d459d8d9fe3b1f042d81fc7dfda3843d2f94cbfbaf3633453e1ab193b
>+SIZE (xpi/firefox-i18n-60.0b3/ast.xpi) = 462807
>+SHA256 (xpi/firefox-i18n-60.0b3/az.xpi) = 67650234ee3961cda299c35b39460add58141724de60341f39d68790cae58d17
>+SIZE (xpi/firefox-i18n-60.0b3/az.xpi) = 473916
>+SHA256 (xpi/firefox-i18n-60.0b3/be.xpi) = 797f526164a6ea42829771c1962448a1f528a489ba955126e04e0675b65f2988
>+SIZE (xpi/firefox-i18n-60.0b3/be.xpi) = 525486
>+SHA256 (xpi/firefox-i18n-60.0b3/bg.xpi) = 66b64a9752bae1e834f5778ed861a96ae43049e80973eb9bc71b4269c87b7657
>+SIZE (xpi/firefox-i18n-60.0b3/bg.xpi) = 518261
>+SHA256 (xpi/firefox-i18n-60.0b3/bn-BD.xpi) = 3c2ba3189e4405620938f78066ece6e3fd196088d142be5dd322ddc49b3941a9
>+SIZE (xpi/firefox-i18n-60.0b3/bn-BD.xpi) = 534196
>+SHA256 (xpi/firefox-i18n-60.0b3/bn-IN.xpi) = 25c0adcb6d360ee2bef1a762ef510cc40dba06191c1e2fe2bfb536ef0ba941ec
>+SIZE (xpi/firefox-i18n-60.0b3/bn-IN.xpi) = 520823
>+SHA256 (xpi/firefox-i18n-60.0b3/br.xpi) = 6076800a6de007d451954b873c26dd24d0b5376f205f3821c1b5b3faa2d667e6
>+SIZE (xpi/firefox-i18n-60.0b3/br.xpi) = 459914
>+SHA256 (xpi/firefox-i18n-60.0b3/bs.xpi) = 2b51e1a289b07369d2e18fee02f2bd0b0f5637e53fe3495754c724d6eb210c08
>+SIZE (xpi/firefox-i18n-60.0b3/bs.xpi) = 466803
>+SHA256 (xpi/firefox-i18n-60.0b3/ca.xpi) = 943ae102d0fc0354729c931c529d2b02c6208843928c0db6a42859e66d9b7802
>+SIZE (xpi/firefox-i18n-60.0b3/ca.xpi) = 474515
>+SHA256 (xpi/firefox-i18n-60.0b3/cak.xpi) = c99abc2edda4347e2dd72913626d6c339f350c026ef6758c5ce8d73eecc731d4
>+SIZE (xpi/firefox-i18n-60.0b3/cak.xpi) = 482387
>+SHA256 (xpi/firefox-i18n-60.0b3/cs.xpi) = e0b1344ecf2e2aff76ea7dfa9725af106f140919569865aebaba4224f5a8e124
>+SIZE (xpi/firefox-i18n-60.0b3/cs.xpi) = 478005
>+SHA256 (xpi/firefox-i18n-60.0b3/cy.xpi) = 6258b44e09180fda6349356967dd05c8d447d5f3fc7c18e8d7c01f57dedaed3a
>+SIZE (xpi/firefox-i18n-60.0b3/cy.xpi) = 463340
>+SHA256 (xpi/firefox-i18n-60.0b3/da.xpi) = 53cad6fdfa1c424b3379c6ed8b9209cef92300b8115b7b8819faea36e897de55
>+SIZE (xpi/firefox-i18n-60.0b3/da.xpi) = 455919
>+SHA256 (xpi/firefox-i18n-60.0b3/de.xpi) = 177903150b7503dc191c4381e49e0359085f447fc47a8ffd4bf65084e2e16f55
>+SIZE (xpi/firefox-i18n-60.0b3/de.xpi) = 476407
>+SHA256 (xpi/firefox-i18n-60.0b3/dsb.xpi) = ab39ed41e78746c778ce6ffa9f65312d32a665dcc52067ee94215ced4ab0e6b2
>+SIZE (xpi/firefox-i18n-60.0b3/dsb.xpi) = 485580
>+SHA256 (xpi/firefox-i18n-60.0b3/el.xpi) = cf6043cbde45353b8268549a19b0347ea38a570242f37edd6fea5ef7f0eeb1b0
>+SIZE (xpi/firefox-i18n-60.0b3/el.xpi) = 541171
>+SHA256 (xpi/firefox-i18n-60.0b3/en-GB.xpi) = d9d13e1ee4621aa824f7b9f7db68853524a6b5eb818f7f1f5617284b6285c9ce
>+SIZE (xpi/firefox-i18n-60.0b3/en-GB.xpi) = 443380
>+SHA256 (xpi/firefox-i18n-60.0b3/en-US.xpi) = 380421cf3257113d428769b8619928af1cb151e01898e772d0f045f9452ede56
>+SIZE (xpi/firefox-i18n-60.0b3/en-US.xpi) = 439189
>+SHA256 (xpi/firefox-i18n-60.0b3/en-ZA.xpi) = 6ba899d8d0849eea1a6ad34dddb4ea64cf5a2beedcdc8a4317f9f99655499c9c
>+SIZE (xpi/firefox-i18n-60.0b3/en-ZA.xpi) = 433608
>+SHA256 (xpi/firefox-i18n-60.0b3/eo.xpi) = 300d389a0d3a7409fd21c4ddcca2bdd4dbf468f89b1d719a86908fe41ec9f48f
>+SIZE (xpi/firefox-i18n-60.0b3/eo.xpi) = 461239
>+SHA256 (xpi/firefox-i18n-60.0b3/es-AR.xpi) = d817f5e313d1aa72b0b9ef8192db12f796f010bd21d759f6b57390e2e405d3ee
>+SIZE (xpi/firefox-i18n-60.0b3/es-AR.xpi) = 471065
>+SHA256 (xpi/firefox-i18n-60.0b3/es-CL.xpi) = 37c2d04425b8734c678d4e21a6ee81c8cfef961ffeae67c1b8f6c9701e37997d
>+SIZE (xpi/firefox-i18n-60.0b3/es-CL.xpi) = 473822
>+SHA256 (xpi/firefox-i18n-60.0b3/es-ES.xpi) = 474c3376eb29a182b7a21f5837a3f92e2452d6e50fcbdc7827563f7988a8a387
>+SIZE (xpi/firefox-i18n-60.0b3/es-ES.xpi) = 395156
>+SHA256 (xpi/firefox-i18n-60.0b3/es-MX.xpi) = b60d8e0557bc20e36d52efc0d830a9a72cd54d76871f85544117f613d9f99125
>+SIZE (xpi/firefox-i18n-60.0b3/es-MX.xpi) = 475160
>+SHA256 (xpi/firefox-i18n-60.0b3/et.xpi) = bec1b07c7db4a995dd05f0c1925d64d59dfdc117ed1d0fa8ede3fe641f8f9931
>+SIZE (xpi/firefox-i18n-60.0b3/et.xpi) = 455787
>+SHA256 (xpi/firefox-i18n-60.0b3/eu.xpi) = 2c1fb71f7b6a289a63cffc639e18c2596669b766b66136624a934e99ea98cd70
>+SIZE (xpi/firefox-i18n-60.0b3/eu.xpi) = 462847
>+SHA256 (xpi/firefox-i18n-60.0b3/fa.xpi) = 2c0a1eec28fbe38e07f0a50d58b5504193103868951c0bdc11e308da7cc915c0
>+SIZE (xpi/firefox-i18n-60.0b3/fa.xpi) = 517837
>+SHA256 (xpi/firefox-i18n-60.0b3/ff.xpi) = d9e58945d8b2316b088ea39fbdac9ac1f598f7439047438b7de938f83aa73e55
>+SIZE (xpi/firefox-i18n-60.0b3/ff.xpi) = 463534
>+SHA256 (xpi/firefox-i18n-60.0b3/fi.xpi) = 7fd2680b739552851552e7e622b3391e21a675162d814557cd6f56ecabf66cef
>+SIZE (xpi/firefox-i18n-60.0b3/fi.xpi) = 454773
>+SHA256 (xpi/firefox-i18n-60.0b3/fr.xpi) = 08925f884d639fa3c311bff351887d6ed89cfe3e910b8999e025358036e4c9f0
>+SIZE (xpi/firefox-i18n-60.0b3/fr.xpi) = 482521
>+SHA256 (xpi/firefox-i18n-60.0b3/fy-NL.xpi) = 29b824756f8ff87232c6dc5d822edb146fb9fbf8a1639b7f04bf44f3e9d7220b
>+SIZE (xpi/firefox-i18n-60.0b3/fy-NL.xpi) = 471866
>+SHA256 (xpi/firefox-i18n-60.0b3/ga-IE.xpi) = 8e6a31ddde88d8dde4076a699a0141f85a7801fd089e88e6d55357ce7c1b0916
>+SIZE (xpi/firefox-i18n-60.0b3/ga-IE.xpi) = 481339
>+SHA256 (xpi/firefox-i18n-60.0b3/gd.xpi) = 7edd4b6407f96b6de040c588814fd31bd35e4430635ff1c9b7a666c271f4aa6e
>+SIZE (xpi/firefox-i18n-60.0b3/gd.xpi) = 471451
>+SHA256 (xpi/firefox-i18n-60.0b3/gl.xpi) = 1598bf09061f1fab4440831eac12a621c128d3ce961a918cf2b0d55a21410484
>+SIZE (xpi/firefox-i18n-60.0b3/gl.xpi) = 447872
>+SHA256 (xpi/firefox-i18n-60.0b3/gn.xpi) = b33cce5269a8a14149fef0a3ac2194426632631014116fa8fa8e9fdca7e573ac
>+SIZE (xpi/firefox-i18n-60.0b3/gn.xpi) = 479163
>+SHA256 (xpi/firefox-i18n-60.0b3/gu-IN.xpi) = 21328b4469f391d235a6aa52a95877a889426b885064f53ede1f65c5dfb996c3
>+SIZE (xpi/firefox-i18n-60.0b3/gu-IN.xpi) = 530856
>+SHA256 (xpi/firefox-i18n-60.0b3/he.xpi) = 726540b4cbb5d4da9bdb84996e45e7998891afe8dec10eb81303985801790415
>+SIZE (xpi/firefox-i18n-60.0b3/he.xpi) = 482051
>+SHA256 (xpi/firefox-i18n-60.0b3/hi-IN.xpi) = cce5fa5c99061bcc16f8c5430313d8f54f6819425067ff1881e7e7662e2f0656
>+SIZE (xpi/firefox-i18n-60.0b3/hi-IN.xpi) = 533423
>+SHA256 (xpi/firefox-i18n-60.0b3/hr.xpi) = 2cde8c53b19e1c876ebc4e913f308d26dc7dec79a8b7a489acc1034a96780f93
>+SIZE (xpi/firefox-i18n-60.0b3/hr.xpi) = 469482
>+SHA256 (xpi/firefox-i18n-60.0b3/hsb.xpi) = 36dfe15abac1d967a642a0dcd68cb2201232991b7ada66263d1c315b0fc0ff89
>+SIZE (xpi/firefox-i18n-60.0b3/hsb.xpi) = 483360
>+SHA256 (xpi/firefox-i18n-60.0b3/hu.xpi) = e2494405b00dfc84ca70259c0706fca86773fc801be310c8c2e3761c0b7059e6
>+SIZE (xpi/firefox-i18n-60.0b3/hu.xpi) = 484440
>+SHA256 (xpi/firefox-i18n-60.0b3/hy-AM.xpi) = 3c0335bc765fc3379de482a60364dd05207622e39c7f48e0acab974511f889be
>+SIZE (xpi/firefox-i18n-60.0b3/hy-AM.xpi) = 517930
>+SHA256 (xpi/firefox-i18n-60.0b3/ia.xpi) = 08f1780aeec56e43dbbb5e619b9a5f2553d6071793f88be4844c5f1de40fd684
>+SIZE (xpi/firefox-i18n-60.0b3/ia.xpi) = 458298
>+SHA256 (xpi/firefox-i18n-60.0b3/id.xpi) = 11831ecb0a7f9fdbd55c22ad96a645a78dc6b3979f004a7630a95e3aef1edde9
>+SIZE (xpi/firefox-i18n-60.0b3/id.xpi) = 450202
>+SHA256 (xpi/firefox-i18n-60.0b3/is.xpi) = 5f730e6a1cde21ae2caf7941e4a47bf29f6b99c3f1cfc9e3fac1308e881748a1
>+SIZE (xpi/firefox-i18n-60.0b3/is.xpi) = 460806
>+SHA256 (xpi/firefox-i18n-60.0b3/it.xpi) = 52bafed44673bcd90659ef1e9c0a4a59800cfc210fb1e714d7cb5ff69f428c02
>+SIZE (xpi/firefox-i18n-60.0b3/it.xpi) = 348666
>+SHA256 (xpi/firefox-i18n-60.0b3/ja.xpi) = 7923f12330af1bc5875ec30746c83a248a1602b44e48a045a1ee1db8cccd80b0
>+SIZE (xpi/firefox-i18n-60.0b3/ja.xpi) = 517964
>+SHA256 (xpi/firefox-i18n-60.0b3/ka.xpi) = 0d4c4c8ef2446883ac9548a290bc02e45add22babc72f48942136276394caa6e
>+SIZE (xpi/firefox-i18n-60.0b3/ka.xpi) = 500317
>+SHA256 (xpi/firefox-i18n-60.0b3/kab.xpi) = 717480d0264e324c7ecaecd40421d2b576a520831ce2ce01b81209d3c19d0f11
>+SIZE (xpi/firefox-i18n-60.0b3/kab.xpi) = 469411
>+SHA256 (xpi/firefox-i18n-60.0b3/kk.xpi) = 025b251bc25ac90a356af55d4a06a18f3b978b9c94024e32db113b92a8b2a1f6
>+SIZE (xpi/firefox-i18n-60.0b3/kk.xpi) = 526816
>+SHA256 (xpi/firefox-i18n-60.0b3/km.xpi) = 3a536d9ca58cf007a9b32ed46c3ebae5865cbfdae5bd8e776d82e2d00e1d24fd
>+SIZE (xpi/firefox-i18n-60.0b3/km.xpi) = 534969
>+SHA256 (xpi/firefox-i18n-60.0b3/kn.xpi) = ad31daf5d7ebb6d8523c64323edfa07b51bca212f80afa51c8fbd77b92975f2c
>+SIZE (xpi/firefox-i18n-60.0b3/kn.xpi) = 535036
>+SHA256 (xpi/firefox-i18n-60.0b3/ko.xpi) = 544e7699e1ae8bd404bf39804979cba4b794d9552c2460464da427064a16d9fd
>+SIZE (xpi/firefox-i18n-60.0b3/ko.xpi) = 493727
>+SHA256 (xpi/firefox-i18n-60.0b3/lij.xpi) = a72c005290ecb379b1588ba917f6fde3cbeecd59fa74ba928e546edd863034c4
>+SIZE (xpi/firefox-i18n-60.0b3/lij.xpi) = 456042
>+SHA256 (xpi/firefox-i18n-60.0b3/lt.xpi) = f5e4a9f76f67939354a2073f4788f1d74c2f9e77a3989f4e9363c5a5345f9cd7
>+SIZE (xpi/firefox-i18n-60.0b3/lt.xpi) = 482894
>+SHA256 (xpi/firefox-i18n-60.0b3/lv.xpi) = 4360940da69bda4f06a1d6f786184903741644101b1121912fe9d4abfbab8b8a
>+SIZE (xpi/firefox-i18n-60.0b3/lv.xpi) = 473177
>+SHA256 (xpi/firefox-i18n-60.0b3/mai.xpi) = 00d5a13fe9f8f890e162c981d7589c01fe11c00df71db2482ec75e7046cb89bf
>+SIZE (xpi/firefox-i18n-60.0b3/mai.xpi) = 505844
>+SHA256 (xpi/firefox-i18n-60.0b3/mk.xpi) = dce14cde1f8273708a490f2c4bded0711fa0f7b5c6246e0fe47fd5e66f329210
>+SIZE (xpi/firefox-i18n-60.0b3/mk.xpi) = 471170
>+SHA256 (xpi/firefox-i18n-60.0b3/ml.xpi) = 3c1f3531b329394259c504fcf09552892521dd0c6fadc5eeb065eaf13d42409e
>+SIZE (xpi/firefox-i18n-60.0b3/ml.xpi) = 548073
>+SHA256 (xpi/firefox-i18n-60.0b3/mr.xpi) = 2231c6fa9e70fdfe1d990a6648c866d13fc4686d90b8e571f82fb8fd09ac4849
>+SIZE (xpi/firefox-i18n-60.0b3/mr.xpi) = 527929
>+SHA256 (xpi/firefox-i18n-60.0b3/ms.xpi) = 7716cabd88d67a28be5fd4b95de7589fd99b49a4e220fd97c8d6afea3dc688a1
>+SIZE (xpi/firefox-i18n-60.0b3/ms.xpi) = 457435
>+SHA256 (xpi/firefox-i18n-60.0b3/my.xpi) = 8dea9196021521ed04fcd08a003e855799e48f6c55673aca1f3cc29ab20ccc44
>+SIZE (xpi/firefox-i18n-60.0b3/my.xpi) = 520518
>+SHA256 (xpi/firefox-i18n-60.0b3/nb-NO.xpi) = eca1fec957d09da6dc43eb10dbfa294363669d5c114e7e40ee053e0d30f4693c
>+SIZE (xpi/firefox-i18n-60.0b3/nb-NO.xpi) = 457336
>+SHA256 (xpi/firefox-i18n-60.0b3/ne-NP.xpi) = e6c7a3071f8fcab626c4ef696b3efad2dda931d3662cb350d8352042c89607ce
>+SIZE (xpi/firefox-i18n-60.0b3/ne-NP.xpi) = 505000
>+SHA256 (xpi/firefox-i18n-60.0b3/nl.xpi) = 139794f03fad4d8eb289754e9c5f17dec678311f1cfbc3778faf2f1589812b09
>+SIZE (xpi/firefox-i18n-60.0b3/nl.xpi) = 463915
>+SHA256 (xpi/firefox-i18n-60.0b3/nn-NO.xpi) = 6bff7f6281f2538409e413e4f9bdec14e9062cdd3c97d453a4cd86708d6d1a71
>+SIZE (xpi/firefox-i18n-60.0b3/nn-NO.xpi) = 458911
>+SHA256 (xpi/firefox-i18n-60.0b3/oc.xpi) = 7fbd098dd43d347e2ba22d906b917bd7fe318eff403f0f64af126b958c359127
>+SIZE (xpi/firefox-i18n-60.0b3/oc.xpi) = 475402
>+SHA256 (xpi/firefox-i18n-60.0b3/or.xpi) = 44a5336595c2bee733a3f2cb5f91f793dfb23c2589c8d8f3cbc48f3666fa259b
>+SIZE (xpi/firefox-i18n-60.0b3/or.xpi) = 498996
>+SHA256 (xpi/firefox-i18n-60.0b3/pa-IN.xpi) = 2c4e53a52ebd80df358b6d8e1ddfaafb0d45d30c31f76ae0d5092a1a2ce00f85
>+SIZE (xpi/firefox-i18n-60.0b3/pa-IN.xpi) = 501556
>+SHA256 (xpi/firefox-i18n-60.0b3/pl.xpi) = 56c55978e319476c39ef211e9fbf93d4ef117f93af0cebd06d2293d467970d3c
>+SIZE (xpi/firefox-i18n-60.0b3/pl.xpi) = 368877
>+SHA256 (xpi/firefox-i18n-60.0b3/pt-BR.xpi) = c8917e87629875e11cf3a5ec6fe5e4b7977912e38fd05e02ef842c12e923c76d
>+SIZE (xpi/firefox-i18n-60.0b3/pt-BR.xpi) = 463587
>+SHA256 (xpi/firefox-i18n-60.0b3/pt-PT.xpi) = 3621d33b748912600d1665425c218436818b7a60a7e9a8b16bc28c7925119ff5
>+SIZE (xpi/firefox-i18n-60.0b3/pt-PT.xpi) = 466657
>+SHA256 (xpi/firefox-i18n-60.0b3/rm.xpi) = 05c929cc5372a8c2b5d50142698b685776af68b5fe47f68309418d3867669dab
>+SIZE (xpi/firefox-i18n-60.0b3/rm.xpi) = 459504
>+SHA256 (xpi/firefox-i18n-60.0b3/ro.xpi) = fb95c9742f2b2961324087af5fff3049b38d2e7b2229bb84fba2ce214def1397
>+SIZE (xpi/firefox-i18n-60.0b3/ro.xpi) = 463548
>+SHA256 (xpi/firefox-i18n-60.0b3/ru.xpi) = 9bad4cd4474fe931c6aa42f3b89203f293dd465aa996150ccb4298acd277b952
>+SIZE (xpi/firefox-i18n-60.0b3/ru.xpi) = 535012
>+SHA256 (xpi/firefox-i18n-60.0b3/si.xpi) = 696eb1a64336ca7657951dc23d8d4e0fd7d6fe9b41635a7ea9fd15bbc66957e1
>+SIZE (xpi/firefox-i18n-60.0b3/si.xpi) = 500214
>+SHA256 (xpi/firefox-i18n-60.0b3/sk.xpi) = f3f5e774e7d43ae91963f33f6f979c42ee13c21c36ab01971f98669ced001f00
>+SIZE (xpi/firefox-i18n-60.0b3/sk.xpi) = 488613
>+SHA256 (xpi/firefox-i18n-60.0b3/sl.xpi) = 5b0eee6f71463fb87fa44206837b015109372073985c1109387ef4ce532c4f32
>+SIZE (xpi/firefox-i18n-60.0b3/sl.xpi) = 466988
>+SHA256 (xpi/firefox-i18n-60.0b3/son.xpi) = ce6fc02a98ef993acb03df5ab0de7d51e05229a8f02cc18e347a7465c587273c
>+SIZE (xpi/firefox-i18n-60.0b3/son.xpi) = 454316
>+SHA256 (xpi/firefox-i18n-60.0b3/sq.xpi) = 34bdbd32667bf908eea6628af28849e0b395c86c31add6bd8c2709b9b4d04b1c
>+SIZE (xpi/firefox-i18n-60.0b3/sq.xpi) = 472320
>+SHA256 (xpi/firefox-i18n-60.0b3/sr.xpi) = 2ea10ed9699e802f4514c5652bb9b3beb44fc2226ba8f5a75e9142faa7ade1f6
>+SIZE (xpi/firefox-i18n-60.0b3/sr.xpi) = 493647
>+SHA256 (xpi/firefox-i18n-60.0b3/sv-SE.xpi) = 8dca1493f1fc62d00250aee990d125a73bfc4e164aa5b1d6c95cab784812b52e
>+SIZE (xpi/firefox-i18n-60.0b3/sv-SE.xpi) = 465641
>+SHA256 (xpi/firefox-i18n-60.0b3/ta.xpi) = 429eb0c71e2709ff73ae004a316542f05b8caaad09ce700eea75b2e7656cf666
>+SIZE (xpi/firefox-i18n-60.0b3/ta.xpi) = 522337
>+SHA256 (xpi/firefox-i18n-60.0b3/te.xpi) = 7e4038953ec7a31442eafffe25e3a1333e4ed313a2a677b5460f2b6bf5c9bc80
>+SIZE (xpi/firefox-i18n-60.0b3/te.xpi) = 535700
>+SHA256 (xpi/firefox-i18n-60.0b3/th.xpi) = 64c76b8181841a934eccd2c9f3630ddfa2686181840eb35edd11024529169b8a
>+SIZE (xpi/firefox-i18n-60.0b3/th.xpi) = 507467
>+SHA256 (xpi/firefox-i18n-60.0b3/tr.xpi) = ef51a4ce7871e61fa44e5dc4c253ce6c6b6a872643d379d5080922596923ac93
>+SIZE (xpi/firefox-i18n-60.0b3/tr.xpi) = 472573
>+SHA256 (xpi/firefox-i18n-60.0b3/uk.xpi) = 58a7298fe6d317f69ef306eed4ae39e2f03fe0e77634a3d79a3f0eb64759afbe
>+SIZE (xpi/firefox-i18n-60.0b3/uk.xpi) = 524811
>+SHA256 (xpi/firefox-i18n-60.0b3/ur.xpi) = f56d7fb2d43af3eee1963aaa0fc932e205bb2fba58dfaed4a1b9ffb7676df079
>+SIZE (xpi/firefox-i18n-60.0b3/ur.xpi) = 515602
>+SHA256 (xpi/firefox-i18n-60.0b3/uz.xpi) = 364823b09773d55ca7b685f4bdecc38b8556faa2cdaf02bda6567fe5adbf66b5
>+SIZE (xpi/firefox-i18n-60.0b3/uz.xpi) = 465257
>+SHA256 (xpi/firefox-i18n-60.0b3/vi.xpi) = e29dab864cc1ac9abe2141b82cf11dd3e393accf26b44d2337673ae0ba41a29a
>+SIZE (xpi/firefox-i18n-60.0b3/vi.xpi) = 479545
>+SHA256 (xpi/firefox-i18n-60.0b3/xh.xpi) = da7079e82d170281ad3828e90ce2c7a0742050c053d03ba3776d025604ab2496
>+SIZE (xpi/firefox-i18n-60.0b3/xh.xpi) = 467861
>+SHA256 (xpi/firefox-i18n-60.0b3/zh-CN.xpi) = 58ed5ccfd66b145c70d82a6423f43d103f30fd491f5088cf2354d660525eaab2
>+SIZE (xpi/firefox-i18n-60.0b3/zh-CN.xpi) = 490717
>+SHA256 (xpi/firefox-i18n-60.0b3/zh-TW.xpi) = 41a7c41a530fd8026af52aba1692e18f1e49a70427a4749c0e2a0830f36e540f
>+SIZE (xpi/firefox-i18n-60.0b3/zh-TW.xpi) = 487681
>diff --git a/www/firefox/Makefile b/www/firefox/Makefile
>index f45b7942de56..1383e3678b93 100644
>--- a/www/firefox/Makefile
>+++ b/www/firefox/Makefile
>@@ -2,28 +2,27 @@
> # $FreeBSD$
> 
> PORTNAME=	firefox
>-DISTVERSION=	59.0
>-PORTREVISION=	4
>+DISTVERSION=	60.0b3
> PORTEPOCH=	1
> CATEGORIES=	www ipv6
>-MASTER_SITES=	https://hg.mozilla.org/releases/mozilla-release/archive/
>-DISTNAME=	${MASTER_SITES:M*hg*:S,/archive/,,:T}-c61f5f5ead48c78a80c80db5c489bdc7cfaf8175
>+MASTER_SITES=	https://hg.mozilla.org/releases/mozilla-beta/archive/
>+DISTNAME=	${MASTER_SITES:M*hg*:S,/archive/,,:T}-93daac564022a618daa8ae32c422a0ffac8a73d0
> DISTFILES=	${DISTNAME:C/.*-//}${EXTRACT_SUFX}
> DIST_SUBDIR=	firefox
> 
> MAINTAINER=	gecko@FreeBSD.org
> COMMENT=	Web browser based on the browser portion of Mozilla
> 
>-BUILD_DEPENDS=	nspr>=4.18:devel/nspr \
>-		nss>=3.35:security/nss \
>+BUILD_DEPENDS=	nspr>=4.19:devel/nspr \
>+		nss>=3.36:security/nss \
> 		icu>=59.1,1:devel/icu \
> 		libevent>=2.1.8:devel/libevent \
>-		harfbuzz>=1.7.4:print/harfbuzz \
>-		graphite2>=1.3.10:graphics/graphite2 \
>+		harfbuzz>=1.7.6:print/harfbuzz \
>+		graphite2>=1.3.11:graphics/graphite2 \
> 		png>=1.6.34:graphics/png \
> 		libvorbis>=1.3.5,3:audio/libvorbis \
> 		libvpx>=1.5.0:multimedia/libvpx \
>-		sqlite3>=3.21.0:databases/sqlite3 \
>+		sqlite3>=3.22.0:databases/sqlite3 \
> 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
> 		v4l_compat>0:multimedia/v4l_compat \
> 		autoconf-2.13:devel/autoconf213 \
>@@ -31,8 +30,6 @@ BUILD_DEPENDS=	nspr>=4.18:devel/nspr \
> 		zip:archivers/zip
> #		soundtouch>=1.9.0:audio/soundtouch \
> 
>-LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
>-
> USE_GECKO=	gecko
> CONFLICTS_INSTALL=	firefox-esr
> MOZ_PKGCONFIG_FILES=	# empty
>diff --git a/www/firefox/distinfo b/www/firefox/distinfo
>index 4e2ef927b387..28ffd3b5bc5a 100644
>--- a/www/firefox/distinfo
>+++ b/www/firefox/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1520650457
>-SHA256 (firefox/c61f5f5ead48c78a80c80db5c489bdc7cfaf8175.tar.bz2) = 1c591e52ca808c3bfbdcd9bcca0c8c1457fe9503face27cde6272a3b791afec4
>-SIZE (firefox/c61f5f5ead48c78a80c80db5c489bdc7cfaf8175.tar.bz2) = 304957396
>+TIMESTAMP = 1520868062
>+SHA256 (firefox/93daac564022a618daa8ae32c422a0ffac8a73d0.tar.bz2) = 0d7a9b1ba4bc7709d05aa7e6c0646e6adc37670cffd13cbb4a9d4f437cf60d53
>+SIZE (firefox/93daac564022a618daa8ae32c422a0ffac8a73d0.tar.bz2) = 329398305
>diff --git a/www/firefox/files/patch-bug1021761 b/www/firefox/files/patch-bug1021761
>index f0764a8c4b22..d2cddd428791 100644
>--- a/www/firefox/files/patch-bug1021761
>+++ b/www/firefox/files/patch-bug1021761
>@@ -1198,9 +1198,9 @@ index b139b8f497fd..d1f8a223c6d8 100755
>  cp $1/src/cubeb_mixer.h src
>  cp $1/src/cubeb_opensl.c src
> +cp $1/src/cubeb_oss.c src
>- cp $1/src/cubeb_osx_run_loop.h src
>- cp $1/src/cubeb_panner.cpp src
>- cp $1/src/cubeb_panner.h src
>+ cp $1/src/cubeb-jni.cpp src
>+ cp $1/src/cubeb-jni.h src
>+ cp $1/src/android/cubeb-output-latency.h src/android
> diff --git toolkit/library/moz.build toolkit/library/moz.build
> index a61c689c83c3..7764df6f8a6b 100644
> --- toolkit/library/moz.build
>diff --git a/www/firefox/files/patch-bug1418162 b/www/firefox/files/patch-bug1418162
>new file mode 100644
>index 000000000000..b454e74c438a
>--- /dev/null
>+++ b/www/firefox/files/patch-bug1418162
>@@ -0,0 +1,58 @@
>+commit b2ebb8d82be2
>+Author: Tom Ritter <tom@mozilla.com>
>+Date:   Mon Feb 19 09:43:27 2018 -0600
>+
>+    Bug 1418162 Use a build constant to determine update channel, and update ESR equation for 60 r?gijs,Build
>+    
>+    Previously we used Services.appinfo.defaultUpdateChannel to determine if we were on ESR
>+    and if so, we would assert to make sure the ESR equation hadn't changed. But that method
>+    is a footgun.  We could use UpdateUtils.getUpdateChannel, but for our purposes here, the
>+    compile-time constant will work just as well.
>+    
>+    If it's set correctly, for Mozilla, we will perform our assert check. If it's not set to
>+    esr (e.g. for Tor), they'll skip the assert. They probably want to control their user agent
>+    themselves anyway.
>+    
>+    MozReview-Commit-ID: DLnWSEpCVJ6
>+---
>+ .../resistfingerprinting/nsRFPService.cpp           | 21 +++++++--------------
>+ 1 file changed, 7 insertions(+), 14 deletions(-)
>+
>+diff --git toolkit/components/resistfingerprinting/nsRFPService.cpp toolkit/components/resistfingerprinting/nsRFPService.cpp
>+index aeb3cb6b3539..1fd6a6e8fe8d 100644
>+--- toolkit/components/resistfingerprinting/nsRFPService.cpp
>++++ toolkit/components/resistfingerprinting/nsRFPService.cpp
>+@@ -606,26 +606,19 @@ nsRFPService::GetSpoofedUserAgent(nsACString &userAgent)
>+   uint32_t firefoxVersion = appVersion.ToInteger(&rv);
>+   NS_ENSURE_SUCCESS(rv, rv);
>+ 
>+-  // Starting from Firefox 10, Firefox ESR was released once every seven
>+-  // Firefox releases, e.g. Firefox 10, 17, 24, 31, and so on.
>+-  // We infer the last and closest ESR version based on this rule.
>+-  nsCOMPtr<nsIXULRuntime> runtime =
>+-    do_GetService("@mozilla.org/xre/runtime;1", &rv);
>+-  NS_ENSURE_SUCCESS(rv, rv);
>+-
>+-  nsAutoCString updateChannel;
>+-  rv = runtime->GetDefaultUpdateChannel(updateChannel);
>+-  NS_ENSURE_SUCCESS(rv, rv);
>+-
>+   // If we are running in Firefox ESR, determine whether the formula of ESR
>+   // version has changed.  Once changed, we must update the formula in this
>+   // function.
>+-  if (updateChannel.EqualsLiteral("esr")) {
>+-    MOZ_ASSERT(((firefoxVersion % 7) == 3),
>++  if (!strcmp(NS_STRINGIFY(MOZ_UPDATE_CHANNEL), "esr")) {
>++    MOZ_ASSERT(((firefoxVersion % 7) == 4),
>+       "Please udpate ESR version formula in nsRFPService.cpp");
>+   }
>+ 
>+-  uint32_t spoofedVersion = firefoxVersion - ((firefoxVersion - 3) % 7);
>++  // Starting from Firefox 10, Firefox ESR was released once every seven
>++  // Firefox releases, e.g. Firefox 10, 17, 24, 31, and so on.
>++  // Except we used 60 as an ESR instead of 59.
>++  // We infer the last and closest ESR version based on this rule.
>++  uint32_t spoofedVersion = firefoxVersion - ((firefoxVersion - 4) % 7);
>+   userAgent.Assign(nsPrintfCString(
>+     "Mozilla/5.0 (%s; rv:%d.0) Gecko/%s Firefox/%d.0",
>+     SPOOFED_UA_OS, spoofedVersion, LEGACY_BUILD_ID, spoofedVersion));
>diff --git a/www/firefox/files/patch-bug1433747 b/www/firefox/files/patch-bug1433747
>deleted file mode 100644
>index 1a3b8737e8c3..000000000000
>--- a/www/firefox/files/patch-bug1433747
>+++ /dev/null
>@@ -1,24 +0,0 @@
>-Apply simd@cf87865a998a to unbreak -C target-cpu with Rust >= 1.24
>-
>-diff --git third_party/rust/simd/.cargo-checksum.json third_party/rust/simd/.cargo-checksum.json
>-index 65f31b0560e6..f16d0dd4fd61 100644
>---- third_party/rust/simd/.cargo-checksum.json
>-+++ third_party/rust/simd/.cargo-checksum.json
>-@@ -1 +1 @@
>--{"files":{".travis.yml":"e2c720c3633b7671efce49147c62b12bcbf630d7c5d6fc65cd97620bfa4ddcea","Cargo.toml":"608aad04f17a524ee21048fa2ce9f656ae344e0473dd0e331dc954f0f9677c63","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6d3a9431e65e69c73a8923e6517b889d17549b23db406b9ec027710d16af701f","README.md":"249294a9a5f63c64c0f7fe4a607060f43f3507dce2378067aa59d25fb3ae681d","benches/mandelbrot.rs":"051b5199e66bca6cf7774e9024915fd4e1349ab39726a10a14e06b60d65d87a4","benches/matrix.rs":"048a21dacdb62365e0105d00d2c8cd6bd2396ac81134f2bff7eb4f7d095fb735","examples/axpy.rs":"4307626045d64ec08361c97c9c72c5dc8d361bdc88f64453b97ac0212041a1b2","examples/convert.rs":"8e658fde050f8a0d8b84ad7570446b10fcf544afbd551b940ca340474f324840","examples/dot-product.rs":"6fe2e007c147af5353804173a593c5b9d57dbccec156e1da37e9e32537363f91","examples/fannkuch-redux-nosimd.rs":"7b2fbde35e8666929d14d67328471cb0483d038a5325232f8db148b30865312b","examples/fannkuch-redux.rs":"ea21fdbd2274488a62cc984acad6e0b65d52f24fb4ff63b7057a3a667e9c8aae","examples/mandelbrot.rs":"8b8fdca1edac50e5a33e0e0592bd41eb75114f31839ccd40d485c61a9a664380","examples/matrix-inverse.rs":"a378d20ef20c2119bb10a86de27c92fec2c2f77f374e6bfd36707c9825a5fe92","examples/nbody-nosimd.rs":"2c8e0a7feacd202fdd65eeceb6420d6e9f43340b81f20a8e532704a587a2796b","examples/nbody.rs":"a864311affab262024479d6348ff51af43d809e9ad332ec30ea4aacceaa2eae1","examples/ops.rs":"1316f915d0afcfa98fdc4077e965ccccf6b4b21c433cbe487ff0cdc60df3cd39","examples/spectral-norm-nosimd.rs":"ffc8512ecde779078ea467f38f423a0ea623c63da7078193f9dd370200773f79","examples/spectral-norm.rs":"edb09c9d477f83939098cfb77a27cc298bc7a0c8a8e29cece0cccae0d70d890e","src/aarch64/mod.rs":"83f52775364c98de0cecb7e1509530c18972e932469f5f1522aa24a735d0fa37","src/aarch64/neon.rs":"1fe769979e07d8e2bc3c78ce116e05d735860744efe097a894cc9421153257fb","src/arm/mod.rs":"dcdd90bc0b39abaf86a0c8946d442b16313563fbae1ff03248628275c74d8617","src/arm/neon.rs":"51cc509856200e80f8e4cc2c982586e6d1cef593ec4537e153dce0cfe31d3428","src/common.rs":"62f4e7e0fefb52ad190d0f2191bc435ac4deab3f2bc70dc427f2a7f9ccb7856e","src/lib.rs":"25f0b39c038fa85af858318135dfd87865be26c33bb4bd1438aec96a1e68d8b5","src/sixty_four.rs":"510a9e00189a61e4f0a5beb7052d5dee37fc8261f94a2af45ef10327e0f3b7df","src/v256.rs":"2e328e49034876d535e0627c7a62191da2b4fb156a657614bf531a5fc75b1385","src/x86/avx.rs":"c66140abefca634b48eae307c3ec8cf5a40f2279b10e246a7e2ac602a2a2bb28","src/x86/avx2.rs":"efe3006b13a13261a3dec3d37dc1d8cb53950f3803c420069231803374949937","src/x86/mod.rs":"0acc5a5e2672e2a0fddc11065663be8b8fa2da87320ea291fa86ff8c2f33edf5","src/x86/sse2.rs":"5ceda75a401958a135fc9d851b22075314cdeed69fd483b6a7be4f11373f40da","src/x86/sse3.rs":"9bd01a4f08069ca4f445952e744d651efe887e3835b18872e757375f0d053bd2","src/x86/sse4_1.rs":"9ceb80dd70a7e7dfeef508cb935e1a2637175bc87a3b090f5dea691ff6aa0516","src/x86/sse4_2.rs":"c59321aed8decdce4d0d8570cff46aed02e1a8265647ef7702e9b180fc581254","src/x86/ssse3.rs":"2290f0269bae316b8e0491495645ee38a9bd73525c8572759c1328341c3bdb4c"},"package":"7a94d14a2ae1f1f110937de5fb69e494372560181c7e1739a097fcc2cee37ba0"}
>-\ No newline at end of file
>-+{"files":{".travis.yml":"e2c720c3633b7671efce49147c62b12bcbf630d7c5d6fc65cd97620bfa4ddcea","Cargo.toml":"608aad04f17a524ee21048fa2ce9f656ae344e0473dd0e331dc954f0f9677c63","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6d3a9431e65e69c73a8923e6517b889d17549b23db406b9ec027710d16af701f","README.md":"249294a9a5f63c64c0f7fe4a607060f43f3507dce2378067aa59d25fb3ae681d","benches/mandelbrot.rs":"051b5199e66bca6cf7774e9024915fd4e1349ab39726a10a14e06b60d65d87a4","benches/matrix.rs":"048a21dacdb62365e0105d00d2c8cd6bd2396ac81134f2bff7eb4f7d095fb735","examples/axpy.rs":"4307626045d64ec08361c97c9c72c5dc8d361bdc88f64453b97ac0212041a1b2","examples/convert.rs":"8e658fde050f8a0d8b84ad7570446b10fcf544afbd551b940ca340474f324840","examples/dot-product.rs":"6fe2e007c147af5353804173a593c5b9d57dbccec156e1da37e9e32537363f91","examples/fannkuch-redux-nosimd.rs":"7b2fbde35e8666929d14d67328471cb0483d038a5325232f8db148b30865312b","examples/fannkuch-redux.rs":"ea21fdbd2274488a62cc984acad6e0b65d52f24fb4ff63b7057a3a667e9c8aae","examples/mandelbrot.rs":"8b8fdca1edac50e5a33e0e0592bd41eb75114f31839ccd40d485c61a9a664380","examples/matrix-inverse.rs":"a378d20ef20c2119bb10a86de27c92fec2c2f77f374e6bfd36707c9825a5fe92","examples/nbody-nosimd.rs":"2c8e0a7feacd202fdd65eeceb6420d6e9f43340b81f20a8e532704a587a2796b","examples/nbody.rs":"a864311affab262024479d6348ff51af43d809e9ad332ec30ea4aacceaa2eae1","examples/ops.rs":"1316f915d0afcfa98fdc4077e965ccccf6b4b21c433cbe487ff0cdc60df3cd39","examples/spectral-norm-nosimd.rs":"ffc8512ecde779078ea467f38f423a0ea623c63da7078193f9dd370200773f79","examples/spectral-norm.rs":"edb09c9d477f83939098cfb77a27cc298bc7a0c8a8e29cece0cccae0d70d890e","src/aarch64/mod.rs":"83f52775364c98de0cecb7e1509530c18972e932469f5f1522aa24a735d0fa37","src/aarch64/neon.rs":"1fe769979e07d8e2bc3c78ce116e05d735860744efe097a894cc9421153257fb","src/arm/mod.rs":"dcdd90bc0b39abaf86a0c8946d442b16313563fbae1ff03248628275c74d8617","src/arm/neon.rs":"51cc509856200e80f8e4cc2c982586e6d1cef593ec4537e153dce0cfe31d3428","src/common.rs":"62f4e7e0fefb52ad190d0f2191bc435ac4deab3f2bc70dc427f2a7f9ccb7856e","src/lib.rs":"25f0b39c038fa85af858318135dfd87865be26c33bb4bd1438aec96a1e68d8b5","src/sixty_four.rs":"510a9e00189a61e4f0a5beb7052d5dee37fc8261f94a2af45ef10327e0f3b7df","src/v256.rs":"2e328e49034876d535e0627c7a62191da2b4fb156a657614bf531a5fc75b1385","src/x86/avx.rs":"c66140abefca634b48eae307c3ec8cf5a40f2279b10e246a7e2ac602a2a2bb28","src/x86/avx2.rs":"3bcb3f391ad5f16f0a6da0bc1301329beb478ad6265bd3b2c9c124fc2e6198e5","src/x86/mod.rs":"0acc5a5e2672e2a0fddc11065663be8b8fa2da87320ea291fa86ff8c2f33edf5","src/x86/sse2.rs":"5ceda75a401958a135fc9d851b22075314cdeed69fd483b6a7be4f11373f40da","src/x86/sse3.rs":"9bd01a4f08069ca4f445952e744d651efe887e3835b18872e757375f0d053bd2","src/x86/sse4_1.rs":"9ceb80dd70a7e7dfeef508cb935e1a2637175bc87a3b090f5dea691ff6aa0516","src/x86/sse4_2.rs":"c59321aed8decdce4d0d8570cff46aed02e1a8265647ef7702e9b180fc581254","src/x86/ssse3.rs":"2290f0269bae316b8e0491495645ee38a9bd73525c8572759c1328341c3bdb4c"},"package":"7a94d14a2ae1f1f110937de5fb69e494372560181c7e1739a097fcc2cee37ba0"}
>-\ No newline at end of file
>-diff --git third_party/rust/simd/src/x86/avx2.rs third_party/rust/simd/src/x86/avx2.rs
>-index fa92e3b60786..e86a33d3b5bb 100644
>---- third_party/rust/simd/src/x86/avx2.rs
>-+++ third_party/rust/simd/src/x86/avx2.rs
>-@@ -42,7 +42,7 @@ extern "platform-intrinsic" {
>-     fn x86_mm256_packus_epi32(x: i32x8, y: i32x8) -> u16x16;
>-     fn x86_mm256_permutevar8x32_epi32(x: i32x8, y: i32x8) -> i32x8;
>-     fn x86_mm256_permutevar8x32_ps(x: f32x8, y: i32x8) -> f32x8;
>--    fn x86_mm256_sad_epu8(x: u8x32, y: u8x32) -> u8x32;
>-+    fn x86_mm256_sad_epu8(x: u8x32, y: u8x32) -> u64x4;
>-     fn x86_mm256_shuffle_epi8(x: i8x32, y: i8x32) -> i8x32;
>-     fn x86_mm256_sign_epi8(x: i8x32, y: i8x32) -> i8x32;
>-     fn x86_mm256_sign_epi16(x: i16x16, y: i16x16) -> i16x16;
>diff --git a/www/firefox/files/patch-bug1437670 b/www/firefox/files/patch-bug1437670
>new file mode 100644
>index 000000000000..158366f7ca0a
>--- /dev/null
>+++ b/www/firefox/files/patch-bug1437670
>@@ -0,0 +1,11036 @@
>+diff --git media/webrtc/trunk/moz.build media/webrtc/trunk/moz.build
>+index 0292981c2191..67a761d5a135 100644
>+--- media/webrtc/trunk/moz.build
>++++ media/webrtc/trunk/moz.build
>+@@ -96,7 +96,7 @@ if CONFIG["OS_TARGET"] == "WINNT":
>+         "/media/webrtc/trunk/webrtc/video_engine/video_engine_gn"
>+     ]
>+ 
>+-if CONFIG["OS_TARGET"] == "Linux":
>++if CONFIG["OS_TARGET"] == "DragonFly":
>+ 
>+     DIRS += [
>+         "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn",
>+@@ -105,7 +105,6 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn",
>+         "/media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn",
>+         "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn",
>+-        "/media/webrtc/trunk/webrtc/system_wrappers/cpu_features_linux_gn",
>+         "/media/webrtc/trunk/webrtc/video_engine/video_engine_gn"
>+     ]
>+ 
>+@@ -122,6 +121,71 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "/media/webrtc/trunk/webrtc/video_engine/video_engine_gn"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DIRS += [
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn",
>++        "/media/webrtc/trunk/webrtc/video_engine/video_engine_gn"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DIRS += [
>++        "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn",
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn",
>++        "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn",
>++        "/media/webrtc/trunk/webrtc/video_engine/video_engine_gn"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "Linux":
>++
>++    DIRS += [
>++        "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn",
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn",
>++        "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn",
>++        "/media/webrtc/trunk/webrtc/system_wrappers/cpu_features_linux_gn",
>++        "/media/webrtc/trunk/webrtc/video_engine/video_engine_gn"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DIRS += [
>++        "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn",
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn",
>++        "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn",
>++        "/media/webrtc/trunk/webrtc/video_engine/video_engine_gn"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DIRS += [
>++        "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn",
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
>++        "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DIRS += [
>++        "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_c_gn",
>++        "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_gn",
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/isac_neon_gn",
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_c_gn",
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_gn",
>++        "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DIRS += [
>+@@ -151,3 +215,12 @@ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
>+         "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_gn",
>+         "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn"
>+     ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DIRS += [
>++        "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn",
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
>++        "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn"
>++    ]
>+diff --git media/webrtc/trunk/webrtc/api/audio_mixer_api_gn/moz.build media/webrtc/trunk/webrtc/api/audio_mixer_api_gn/moz.build
>+index 9f9b4e365084..ac0c9d5f246e 100644
>+--- media/webrtc/trunk/webrtc/api/audio_mixer_api_gn/moz.build
>++++ media/webrtc/trunk/webrtc/api/audio_mixer_api_gn/moz.build
>+@@ -65,6 +65,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -73,6 +87,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -106,6 +134,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -121,6 +165,11 @@ if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -132,4 +181,9 @@ if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>+ Library("audio_mixer_api_gn")
>+diff --git media/webrtc/trunk/webrtc/api/call_api_gn/moz.build media/webrtc/trunk/webrtc/api/call_api_gn/moz.build
>+index 516ef78c4911..e83c47210c06 100644
>+--- media/webrtc/trunk/webrtc/api/call_api_gn/moz.build
>++++ media/webrtc/trunk/webrtc/api/call_api_gn/moz.build
>+@@ -65,6 +65,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -73,6 +87,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -106,6 +134,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -121,6 +165,11 @@ if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -132,4 +181,9 @@ if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>+ Library("call_api_gn")
>+diff --git media/webrtc/trunk/webrtc/api/transport_api_gn/moz.build media/webrtc/trunk/webrtc/api/transport_api_gn/moz.build
>+index 2c864e42a07f..4d249b2e5402 100644
>+--- media/webrtc/trunk/webrtc/api/transport_api_gn/moz.build
>++++ media/webrtc/trunk/webrtc/api/transport_api_gn/moz.build
>+@@ -61,6 +61,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -69,6 +83,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -102,6 +130,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -117,6 +161,11 @@ if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -128,4 +177,9 @@ if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>+ Library("transport_api_gn")
>+diff --git media/webrtc/trunk/webrtc/api/video_frame_api_gn/moz.build media/webrtc/trunk/webrtc/api/video_frame_api_gn/moz.build
>+index 29bea6b3d128..81b605fa0d37 100644
>+--- media/webrtc/trunk/webrtc/api/video_frame_api_gn/moz.build
>++++ media/webrtc/trunk/webrtc/api/video_frame_api_gn/moz.build
>+@@ -71,6 +71,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -83,6 +97,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -120,6 +148,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -145,6 +189,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -166,4 +233,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("video_frame_api_gn")
>+diff --git media/webrtc/trunk/webrtc/audio/audio_gn/moz.build media/webrtc/trunk/webrtc/audio/audio_gn/moz.build
>+index 31bfe517ce43..c43284f7e032 100644
>+--- media/webrtc/trunk/webrtc/audio/audio_gn/moz.build
>++++ media/webrtc/trunk/webrtc/audio/audio_gn/moz.build
>+@@ -90,6 +90,22 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "-framework CoreVideo"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -105,6 +121,22 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -146,6 +178,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -171,6 +219,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -192,4 +263,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("audio_gn")
>+diff --git media/webrtc/trunk/webrtc/audio/utility/audio_frame_operations_gn/moz.build media/webrtc/trunk/webrtc/audio/utility/audio_frame_operations_gn/moz.build
>+index 9fd694319308..26259d834b26 100644
>+--- media/webrtc/trunk/webrtc/audio/utility/audio_frame_operations_gn/moz.build
>++++ media/webrtc/trunk/webrtc/audio/utility/audio_frame_operations_gn/moz.build
>+@@ -69,6 +69,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -77,6 +91,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -110,6 +138,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -135,6 +179,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -156,4 +223,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("audio_frame_operations_gn")
>+diff --git media/webrtc/trunk/webrtc/base/gtest_prod_gn/moz.build media/webrtc/trunk/webrtc/base/gtest_prod_gn/moz.build
>+index 78e13fc728b4..54277e5cf0a2 100644
>+--- media/webrtc/trunk/webrtc/base/gtest_prod_gn/moz.build
>++++ media/webrtc/trunk/webrtc/base/gtest_prod_gn/moz.build
>+@@ -61,6 +61,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -69,6 +83,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -102,6 +130,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -117,6 +161,11 @@ if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -128,4 +177,9 @@ if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>+ Library("gtest_prod_gn")
>+diff --git media/webrtc/trunk/webrtc/base/rtc_base_approved_gn/moz.build media/webrtc/trunk/webrtc/base/rtc_base_approved_gn/moz.build
>+index 9d8984d7314e..63f7424ead1b 100644
>+--- media/webrtc/trunk/webrtc/base/rtc_base_approved_gn/moz.build
>++++ media/webrtc/trunk/webrtc/base/rtc_base_approved_gn/moz.build
>+@@ -107,6 +107,28 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "/media/webrtc/trunk/webrtc/base/macutils.cc"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/base/file_posix.cc"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/base/file_posix.cc"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -119,6 +141,28 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "/media/webrtc/trunk/webrtc/base/file_posix.cc"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/base/file_posix.cc"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/base/file_posix.cc"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -157,6 +201,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -182,6 +242,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -203,4 +286,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("rtc_base_approved_gn")
>+diff --git media/webrtc/trunk/webrtc/base/rtc_numerics_gn/moz.build media/webrtc/trunk/webrtc/base/rtc_numerics_gn/moz.build
>+index 53f9ece07e2d..d4cf99fb0ca5 100644
>+--- media/webrtc/trunk/webrtc/base/rtc_numerics_gn/moz.build
>++++ media/webrtc/trunk/webrtc/base/rtc_numerics_gn/moz.build
>+@@ -69,6 +69,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -77,6 +91,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -110,6 +138,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -135,6 +179,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -156,4 +223,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("rtc_numerics_gn")
>+diff --git media/webrtc/trunk/webrtc/base/rtc_task_queue_gn/moz.build media/webrtc/trunk/webrtc/base/rtc_task_queue_gn/moz.build
>+index 3d0babc48c28..11cd49ed3301 100644
>+--- media/webrtc/trunk/webrtc/base/rtc_task_queue_gn/moz.build
>++++ media/webrtc/trunk/webrtc/base/rtc_task_queue_gn/moz.build
>+@@ -86,6 +86,42 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "/media/webrtc/trunk/webrtc/base/task_queue_posix.cc"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    LOCAL_INCLUDES += [
>++        "/ipc/chromium/src/third_party/libevent/include/",
>++        "/ipc/chromium/src/third_party/libevent/linux/"
>++    ]
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/base/task_queue_libevent.cc",
>++        "/media/webrtc/trunk/webrtc/base/task_queue_posix.cc"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    LOCAL_INCLUDES += [
>++        "/ipc/chromium/src/third_party/libevent/include/",
>++        "/ipc/chromium/src/third_party/libevent/linux/"
>++    ]
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/base/task_queue_libevent.cc",
>++        "/media/webrtc/trunk/webrtc/base/task_queue_posix.cc"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -105,6 +141,42 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "/media/webrtc/trunk/webrtc/base/task_queue_posix.cc"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    LOCAL_INCLUDES += [
>++        "/ipc/chromium/src/third_party/libevent/include/",
>++        "/ipc/chromium/src/third_party/libevent/linux/"
>++    ]
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/base/task_queue_libevent.cc",
>++        "/media/webrtc/trunk/webrtc/base/task_queue_posix.cc"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    LOCAL_INCLUDES += [
>++        "/ipc/chromium/src/third_party/libevent/include/",
>++        "/ipc/chromium/src/third_party/libevent/linux/"
>++    ]
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/base/task_queue_libevent.cc",
>++        "/media/webrtc/trunk/webrtc/base/task_queue_posix.cc"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -142,6 +214,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -167,6 +255,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -188,4 +299,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("rtc_task_queue_gn")
>+diff --git media/webrtc/trunk/webrtc/call/call_gn/moz.build media/webrtc/trunk/webrtc/call/call_gn/moz.build
>+index 3f987c322ffd..303d67aa3930 100644
>+--- media/webrtc/trunk/webrtc/call/call_gn/moz.build
>++++ media/webrtc/trunk/webrtc/call/call_gn/moz.build
>+@@ -81,6 +81,22 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "-framework CoreVideo"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -96,6 +112,22 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -137,6 +169,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -162,6 +210,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -183,4 +254,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("call_gn")
>+diff --git media/webrtc/trunk/webrtc/call/call_interfaces_gn/moz.build media/webrtc/trunk/webrtc/call/call_interfaces_gn/moz.build
>+index 9d353c04625b..7f28e1cd0dee 100644
>+--- media/webrtc/trunk/webrtc/call/call_interfaces_gn/moz.build
>++++ media/webrtc/trunk/webrtc/call/call_interfaces_gn/moz.build
>+@@ -65,6 +65,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -73,6 +87,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -106,6 +134,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -131,6 +175,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -152,4 +219,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("call_interfaces_gn")
>+diff --git media/webrtc/trunk/webrtc/common_audio/common_audio_c_gn/moz.build media/webrtc/trunk/webrtc/common_audio/common_audio_c_gn/moz.build
>+index fb9ac6ffa332..5d4f59b94099 100644
>+--- media/webrtc/trunk/webrtc/common_audio/common_audio_c_gn/moz.build
>++++ media/webrtc/trunk/webrtc/common_audio/common_audio_c_gn/moz.build
>+@@ -114,6 +114,32 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "/media/webrtc/trunk/webrtc/common_audio/signal_processing/spl_sqrt_floor.c"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/complex_bit_reverse.c",
>++        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/filter_ar_fast_q12.c",
>++        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/spl_sqrt_floor.c"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/complex_bit_reverse.c",
>++        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/filter_ar_fast_q12.c",
>++        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/spl_sqrt_floor.c"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -128,6 +154,32 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "/media/webrtc/trunk/webrtc/common_audio/signal_processing/spl_sqrt_floor.c"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/complex_bit_reverse.c",
>++        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/filter_ar_fast_q12.c",
>++        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/spl_sqrt_floor.c"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/complex_bit_reverse.c",
>++        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/filter_ar_fast_q12.c",
>++        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/spl_sqrt_floor.c"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -167,6 +219,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -210,6 +278,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "/media/webrtc/trunk/webrtc/common_audio/signal_processing/spl_sqrt_floor.c"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -249,4 +340,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "/media/webrtc/trunk/webrtc/common_audio/signal_processing/spl_sqrt_floor.c"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("common_audio_c_gn")
>+diff --git media/webrtc/trunk/webrtc/common_audio/common_audio_gn/moz.build media/webrtc/trunk/webrtc/common_audio/common_audio_gn/moz.build
>+index 706886b0238a..f5eea840f093 100644
>+--- media/webrtc/trunk/webrtc/common_audio/common_audio_gn/moz.build
>++++ media/webrtc/trunk/webrtc/common_audio/common_audio_gn/moz.build
>+@@ -90,6 +90,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -102,6 +116,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -139,6 +167,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -164,6 +208,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -185,4 +252,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("common_audio_gn")
>+diff --git media/webrtc/trunk/webrtc/common_audio/common_audio_neon_c_gn/moz.build media/webrtc/trunk/webrtc/common_audio/common_audio_neon_c_gn/moz.build
>+index 468e0f4b6779..fea41c9ad880 100644
>+--- media/webrtc/trunk/webrtc/common_audio/common_audio_neon_c_gn/moz.build
>++++ media/webrtc/trunk/webrtc/common_audio/common_audio_neon_c_gn/moz.build
>+@@ -10,25 +10,15 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>+ COMPILE_FLAGS["STL"] = []
>+ AllowCompilerWarnings()
>+ 
>+-DEFINES["ANDROID"] = True
>+-DEFINES["ANDROID_NDK_VERSION"] = "r12b"
>+ DEFINES["CHROMIUM_BUILD"] = True
>+-DEFINES["DISABLE_NACL"] = True
>+ DEFINES["EXPAT_RELATIVE_PATH"] = True
>+-DEFINES["HAVE_SYS_UIO_H"] = True
>+-DEFINES["NO_TCMALLOC"] = True
>+-DEFINES["USE_OPENSSL_CERTS"] = "1"
>+ DEFINES["V8_DEPRECATION_WARNINGS"] = True
>+-DEFINES["WEBRTC_ANDROID"] = True
>+-DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+ DEFINES["WEBRTC_HAS_NEON"] = True
>+ DEFINES["WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE"] = True
>+-DEFINES["WEBRTC_LINUX"] = True
>+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+ DEFINES["WEBRTC_POSIX"] = True
>+ DEFINES["WEBRTC_RESTRICT_LOGGING"] = True
>+ DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-DEFINES["__GNU_SOURCE"] = "1"
>+ 
>+ FINAL_LIBRARY = "webrtc"
>+ 
>+@@ -58,6 +48,25 @@ if CONFIG["MOZ_DEBUG"] == "1":
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+     DEFINES["WTF_USE_DYNAMIC_ANNOTATIONS"] = "1"
>+ 
>++if CONFIG["OS_TARGET"] == "Android":
>++
>++    DEFINES["ANDROID"] = True
>++    DEFINES["ANDROID_NDK_VERSION"] = "r12b"
>++    DEFINES["DISABLE_NACL"] = True
>++    DEFINES["HAVE_SYS_UIO_H"] = True
>++    DEFINES["NO_TCMALLOC"] = True
>++    DEFINES["USE_OPENSSL_CERTS"] = "1"
>++    DEFINES["WEBRTC_ANDROID"] = True
>++    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>++    DEFINES["WEBRTC_LINUX"] = True
>++    DEFINES["__GNU_SOURCE"] = "1"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_BSD"] = True
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+diff --git media/webrtc/trunk/webrtc/common_audio/common_audio_neon_gn/moz.build media/webrtc/trunk/webrtc/common_audio/common_audio_neon_gn/moz.build
>+index c35a5100983e..dcdd404efe35 100644
>+--- media/webrtc/trunk/webrtc/common_audio/common_audio_neon_gn/moz.build
>++++ media/webrtc/trunk/webrtc/common_audio/common_audio_neon_gn/moz.build
>+@@ -10,25 +10,15 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>+ COMPILE_FLAGS["STL"] = []
>+ AllowCompilerWarnings()
>+ 
>+-DEFINES["ANDROID"] = True
>+-DEFINES["ANDROID_NDK_VERSION"] = "r12b"
>+ DEFINES["CHROMIUM_BUILD"] = True
>+-DEFINES["DISABLE_NACL"] = True
>+ DEFINES["EXPAT_RELATIVE_PATH"] = True
>+-DEFINES["HAVE_SYS_UIO_H"] = True
>+-DEFINES["NO_TCMALLOC"] = True
>+-DEFINES["USE_OPENSSL_CERTS"] = "1"
>+ DEFINES["V8_DEPRECATION_WARNINGS"] = True
>+-DEFINES["WEBRTC_ANDROID"] = True
>+-DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+ DEFINES["WEBRTC_HAS_NEON"] = True
>+ DEFINES["WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE"] = True
>+-DEFINES["WEBRTC_LINUX"] = True
>+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+ DEFINES["WEBRTC_POSIX"] = True
>+ DEFINES["WEBRTC_RESTRICT_LOGGING"] = True
>+ DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-DEFINES["__GNU_SOURCE"] = "1"
>+ 
>+ FINAL_LIBRARY = "webrtc"
>+ 
>+@@ -57,6 +47,25 @@ if CONFIG["MOZ_DEBUG"] == "1":
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+     DEFINES["WTF_USE_DYNAMIC_ANNOTATIONS"] = "1"
>+ 
>++if CONFIG["OS_TARGET"] == "Android":
>++
>++    DEFINES["ANDROID"] = True
>++    DEFINES["ANDROID_NDK_VERSION"] = "r12b"
>++    DEFINES["DISABLE_NACL"] = True
>++    DEFINES["HAVE_SYS_UIO_H"] = True
>++    DEFINES["NO_TCMALLOC"] = True
>++    DEFINES["USE_OPENSSL_CERTS"] = "1"
>++    DEFINES["WEBRTC_ANDROID"] = True
>++    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>++    DEFINES["WEBRTC_LINUX"] = True
>++    DEFINES["__GNU_SOURCE"] = "1"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_BSD"] = True
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+diff --git media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn/moz.build media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn/moz.build
>+index b82e8740a0ab..5fa3c15bc163 100644
>+--- media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn/moz.build
>++++ media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn/moz.build
>+@@ -75,6 +75,28 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     CXXFLAGS += [
>+@@ -87,6 +109,29 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2",
>++        "-msse2"
>++    ]
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -120,6 +165,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+diff --git media/webrtc/trunk/webrtc/common_video/common_video_gn/moz.build media/webrtc/trunk/webrtc/common_video/common_video_gn/moz.build
>+index 237df9942375..3a7cf3ddabc7 100644
>+--- media/webrtc/trunk/webrtc/common_video/common_video_gn/moz.build
>++++ media/webrtc/trunk/webrtc/common_video/common_video_gn/moz.build
>+@@ -93,6 +93,22 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "/media/webrtc/trunk/webrtc/common_video/corevideo_frame_buffer.cc"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -106,6 +122,22 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -143,6 +175,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -168,6 +216,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -189,4 +260,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("common_video_gn")
>+diff --git media/webrtc/trunk/webrtc/logging/rtc_event_log_api_gn/moz.build media/webrtc/trunk/webrtc/logging/rtc_event_log_api_gn/moz.build
>+index 477ff0ddc459..5ffb1744904b 100644
>+--- media/webrtc/trunk/webrtc/logging/rtc_event_log_api_gn/moz.build
>++++ media/webrtc/trunk/webrtc/logging/rtc_event_log_api_gn/moz.build
>+@@ -61,6 +61,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -69,6 +83,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -102,6 +130,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -117,6 +161,11 @@ if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -128,4 +177,9 @@ if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>+ Library("rtc_event_log_api_gn")
>+diff --git media/webrtc/trunk/webrtc/logging/rtc_event_log_impl_gn/moz.build media/webrtc/trunk/webrtc/logging/rtc_event_log_impl_gn/moz.build
>+index 16d2861a0f2c..c87c2f914046 100644
>+--- media/webrtc/trunk/webrtc/logging/rtc_event_log_impl_gn/moz.build
>++++ media/webrtc/trunk/webrtc/logging/rtc_event_log_impl_gn/moz.build
>+@@ -75,6 +75,22 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "-framework CoreVideo"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -88,6 +104,22 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -125,6 +157,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -150,6 +198,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -171,4 +242,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("rtc_event_log_impl_gn")
>+diff --git media/webrtc/trunk/webrtc/media/mozilla_rtc_media_gn/moz.build media/webrtc/trunk/webrtc/media/mozilla_rtc_media_gn/moz.build
>+index 46bdea513d72..e92a58f61921 100644
>+--- media/webrtc/trunk/webrtc/media/mozilla_rtc_media_gn/moz.build
>++++ media/webrtc/trunk/webrtc/media/mozilla_rtc_media_gn/moz.build
>+@@ -67,6 +67,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -75,6 +89,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -108,6 +136,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -133,6 +177,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -154,4 +221,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("mozilla_rtc_media_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/audio_coding_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/audio_coding_gn/moz.build
>+index 7b8b52a50144..848e05c7f8d9 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/audio_coding_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/audio_coding_gn/moz.build
>+@@ -92,6 +92,28 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    LOCAL_INCLUDES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    LOCAL_INCLUDES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -109,6 +131,28 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    LOCAL_INCLUDES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    LOCAL_INCLUDES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -150,6 +194,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -187,6 +247,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -220,4 +303,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("audio_coding_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/audio_decoder_factory_interface_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/audio_decoder_factory_interface_gn/moz.build
>+index b0a1acb1952e..c14a19fc2474 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/audio_decoder_factory_interface_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/audio_decoder_factory_interface_gn/moz.build
>+@@ -65,6 +65,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -73,6 +87,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -106,6 +134,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -121,6 +165,11 @@ if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -132,4 +181,9 @@ if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>+ Library("audio_decoder_factory_interface_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/audio_decoder_interface_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/audio_decoder_interface_gn/moz.build
>+index 458c3695687a..9d7d81d2bc22 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/audio_decoder_interface_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/audio_decoder_interface_gn/moz.build
>+@@ -70,6 +70,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -78,6 +92,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -111,6 +139,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -136,6 +180,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -157,4 +224,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("audio_decoder_interface_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/audio_encoder_interface_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/audio_encoder_interface_gn/moz.build
>+index 5e26fb762d85..2e9d4bf8cc8a 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/audio_encoder_interface_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/audio_encoder_interface_gn/moz.build
>+@@ -69,6 +69,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -77,6 +91,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -110,6 +138,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -135,6 +179,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -156,4 +223,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("audio_encoder_interface_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/audio_format_conversion_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/audio_format_conversion_gn/moz.build
>+index 76e7d08f977f..7d2060a43eb7 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/audio_format_conversion_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/audio_format_conversion_gn/moz.build
>+@@ -69,6 +69,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -77,6 +91,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -110,6 +138,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -135,6 +179,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -156,4 +223,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("audio_format_conversion_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/audio_format_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/audio_format_gn/moz.build
>+index e1e96c810fb8..0b5693d1ddac 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/audio_format_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/audio_format_gn/moz.build
>+@@ -65,6 +65,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -73,6 +87,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -106,6 +134,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -131,6 +175,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -152,4 +219,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("audio_format_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
>+index e32ac3d3f71e..f6bfffaa278c 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
>+@@ -81,6 +81,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -93,6 +107,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -130,6 +158,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -155,6 +199,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -176,4 +243,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("audio_network_adaptor_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/builtin_audio_decoder_factory_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/builtin_audio_decoder_factory_gn/moz.build
>+index b3587a35a860..d6b5fe9e72fc 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/builtin_audio_decoder_factory_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/builtin_audio_decoder_factory_gn/moz.build
>+@@ -80,6 +80,28 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    LOCAL_INCLUDES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    LOCAL_INCLUDES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -97,6 +119,28 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    LOCAL_INCLUDES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    LOCAL_INCLUDES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -138,6 +182,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -175,6 +235,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -208,4 +291,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("builtin_audio_decoder_factory_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/cng_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/cng_gn/moz.build
>+index ef17a4e46c28..b1f25580ddf6 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/cng_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/cng_gn/moz.build
>+@@ -74,6 +74,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -86,6 +100,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -123,6 +151,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -148,6 +192,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -169,4 +236,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("cng_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/g711_c_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/g711_c_gn/moz.build
>+index 8dcfed9b6292..39c49b423af0 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/g711_c_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/g711_c_gn/moz.build
>+@@ -66,6 +66,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -74,6 +88,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -107,6 +135,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -132,6 +176,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -153,4 +220,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("g711_c_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/g711_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/g711_gn/moz.build
>+index cd01d13ff660..823f3c7750a7 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/g711_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/g711_gn/moz.build
>+@@ -71,6 +71,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -79,6 +93,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -112,6 +140,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -137,6 +181,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -158,4 +225,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("g711_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/g722_c_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/g722_c_gn/moz.build
>+index 86cb12c5d4f8..3a97192504b2 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/g722_c_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/g722_c_gn/moz.build
>+@@ -70,6 +70,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -78,6 +92,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -111,6 +139,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -136,6 +180,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -157,4 +224,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("g722_c_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/g722_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/g722_gn/moz.build
>+index 4f65ac0062e4..e53fc64410e5 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/g722_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/g722_gn/moz.build
>+@@ -71,6 +71,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -79,6 +93,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -112,6 +140,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -137,6 +181,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -158,4 +225,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("g722_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/isac_c_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/isac_c_gn/moz.build
>+index 2b80215e7978..53632d94843b 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/isac_c_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/isac_c_gn/moz.build
>+@@ -101,6 +101,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -114,6 +128,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -151,6 +179,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -176,6 +220,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -197,4 +264,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("isac_c_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/isac_common_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/isac_common_gn/moz.build
>+index be5aa83372c0..f7117f4358f3 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/isac_common_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/isac_common_gn/moz.build
>+@@ -69,6 +69,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -77,6 +91,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -110,6 +138,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -135,6 +179,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -156,4 +223,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("isac_common_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/isac_fix_c_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/isac_fix_c_gn/moz.build
>+index dd94b2d6b546..f20b32841934 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/isac_fix_c_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/isac_fix_c_gn/moz.build
>+@@ -110,6 +110,36 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c"
>++    ]
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c"
>++    ]
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -130,6 +160,36 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c"
>++    ]
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c"
>++    ]
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -175,6 +235,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -221,6 +297,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -263,4 +362,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("isac_fix_c_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/isac_fix_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/isac_fix_gn/moz.build
>+index f6ad5df072aa..e60e24ed4c69 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/isac_fix_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/isac_fix_gn/moz.build
>+@@ -75,6 +75,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -87,6 +101,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -124,6 +152,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -149,6 +193,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -170,4 +237,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("isac_fix_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/isac_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/isac_gn/moz.build
>+index 9af02ae6b976..83fa14ce6c6b 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/isac_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/isac_gn/moz.build
>+@@ -72,6 +72,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -85,6 +99,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -122,6 +150,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -147,6 +191,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -168,4 +235,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("isac_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/isac_neon_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/isac_neon_gn/moz.build
>+index 0d32b4ac0ecf..86360db061ad 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/isac_neon_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/isac_neon_gn/moz.build
>+@@ -10,25 +10,15 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>+ COMPILE_FLAGS["STL"] = []
>+ AllowCompilerWarnings()
>+ 
>+-DEFINES["ANDROID"] = True
>+-DEFINES["ANDROID_NDK_VERSION"] = "r12b"
>+ DEFINES["CHROMIUM_BUILD"] = True
>+-DEFINES["DISABLE_NACL"] = True
>+ DEFINES["EXPAT_RELATIVE_PATH"] = True
>+-DEFINES["HAVE_SYS_UIO_H"] = True
>+-DEFINES["NO_TCMALLOC"] = True
>+-DEFINES["USE_OPENSSL_CERTS"] = "1"
>+ DEFINES["V8_DEPRECATION_WARNINGS"] = True
>+-DEFINES["WEBRTC_ANDROID"] = True
>+-DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+ DEFINES["WEBRTC_HAS_NEON"] = True
>+ DEFINES["WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE"] = True
>+-DEFINES["WEBRTC_LINUX"] = True
>+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+ DEFINES["WEBRTC_POSIX"] = True
>+ DEFINES["WEBRTC_RESTRICT_LOGGING"] = True
>+ DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-DEFINES["__GNU_SOURCE"] = "1"
>+ 
>+ FINAL_LIBRARY = "webrtc"
>+ 
>+@@ -45,10 +35,6 @@ LOCAL_INCLUDES += [
>+     "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/include/"
>+ ]
>+ 
>+-OS_LIBS += [
>+-    "log"
>+-]
>+-
>+ UNIFIED_SOURCES += [
>+     "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding_neon.c",
>+     "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks_neon.c",
>+@@ -69,6 +55,29 @@ if CONFIG["MOZ_DEBUG"] == "1":
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+     DEFINES["WTF_USE_DYNAMIC_ANNOTATIONS"] = "1"
>+ 
>++if CONFIG["OS_TARGET"] == "Android":
>++
>++    DEFINES["ANDROID"] = True
>++    DEFINES["ANDROID_NDK_VERSION"] = "r12b"
>++    DEFINES["DISABLE_NACL"] = True
>++    DEFINES["HAVE_SYS_UIO_H"] = True
>++    DEFINES["NO_TCMALLOC"] = True
>++    DEFINES["USE_OPENSSL_CERTS"] = "1"
>++    DEFINES["WEBRTC_ANDROID"] = True
>++    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>++    DEFINES["WEBRTC_LINUX"] = True
>++    DEFINES["__GNU_SOURCE"] = "1"
>++
>++    OS_LIBS += [
>++        "log"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_BSD"] = True
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/neteq_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/neteq_gn/moz.build
>+index 2a2f7ed76fd3..3423d92fd759 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/neteq_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/neteq_gn/moz.build
>+@@ -123,6 +123,30 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_CODEC_ISAC"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    LOCAL_INCLUDES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_CODEC_ISAC"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    LOCAL_INCLUDES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -141,6 +165,30 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_CODEC_ISAC"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    LOCAL_INCLUDES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_CODEC_ISAC"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    LOCAL_INCLUDES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -183,6 +231,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -220,6 +284,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -253,4 +340,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("neteq_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/pcm16b_c_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/pcm16b_c_gn/moz.build
>+index cb3863c723ed..8dd7e1bbf07d 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/pcm16b_c_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/pcm16b_c_gn/moz.build
>+@@ -66,6 +66,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -74,6 +88,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -107,6 +135,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -132,6 +176,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -153,4 +220,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("pcm16b_c_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/pcm16b_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/pcm16b_gn/moz.build
>+index ef378b0e5efb..475086d5abc7 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/pcm16b_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/pcm16b_gn/moz.build
>+@@ -72,6 +72,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -80,6 +94,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -113,6 +141,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -138,6 +182,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -159,4 +226,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("pcm16b_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/rent_a_codec_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/rent_a_codec_gn/moz.build
>+index 00c769c9d481..f2759b871e6a 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/rent_a_codec_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/rent_a_codec_gn/moz.build
>+@@ -81,6 +81,28 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    LOCAL_INCLUDES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    LOCAL_INCLUDES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -98,6 +120,28 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    LOCAL_INCLUDES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    LOCAL_INCLUDES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -139,6 +183,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -176,6 +236,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -209,4 +292,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("rent_a_codec_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/webrtc_opus_c_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/webrtc_opus_c_gn/moz.build
>+index 37eb99386bc1..f0b0c70f541d 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/webrtc_opus_c_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/webrtc_opus_c_gn/moz.build
>+@@ -70,6 +70,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -78,6 +92,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -111,6 +139,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -136,6 +180,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -157,4 +224,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("webrtc_opus_c_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/webrtc_opus_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_coding/webrtc_opus_gn/moz.build
>+index 4fd97ed7d4d8..1e119b2fda85 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_coding/webrtc_opus_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_coding/webrtc_opus_gn/moz.build
>+@@ -74,6 +74,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -86,6 +100,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -123,6 +151,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -148,6 +192,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -169,4 +236,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("webrtc_opus_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_conference_mixer/audio_conference_mixer_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_conference_mixer/audio_conference_mixer_gn/moz.build
>+index ef967ae4d17a..6f82159980aa 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_conference_mixer/audio_conference_mixer_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_conference_mixer/audio_conference_mixer_gn/moz.build
>+@@ -73,6 +73,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -86,6 +100,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -123,6 +151,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -148,6 +192,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -169,4 +236,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("audio_conference_mixer_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_device/audio_device_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_device/audio_device_gn/moz.build
>+index 6026ed7939c6..5ded7d30b670 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_device/audio_device_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_device/audio_device_gn/moz.build
>+@@ -120,6 +120,22 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "/media/webrtc/trunk/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.cc"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["LINUX_PULSE"] = True
>+@@ -150,6 +166,22 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "/media/webrtc/trunk/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.cc"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -204,6 +236,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -229,6 +277,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -250,4 +321,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("audio_device_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
>+index a214e68a4634..a11d9a416bf0 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
>+@@ -69,6 +69,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -77,6 +91,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -110,6 +138,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -135,6 +179,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -156,4 +223,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("audio_frame_manipulator_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
>+index 7f164fdf0987..a9189fc17b90 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
>+@@ -70,6 +70,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -83,6 +97,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -120,6 +148,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -145,6 +189,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -166,4 +233,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("audio_mixer_impl_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_c_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_c_gn/moz.build
>+index 0fd510657c14..529c07e1b56c 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_c_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_c_gn/moz.build
>+@@ -81,6 +81,25 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/ns_core.c"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/noise_suppression.c",
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/ns_core.c"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -98,6 +117,30 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/ns_core.c"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/noise_suppression.c",
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/ns_core.c"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/noise_suppression.c",
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/ns_core.c"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -140,6 +183,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -182,6 +241,47 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/ns_core.c"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/noise_suppression_x.c",
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/nsx_core.c",
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/nsx_core_c.c"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/noise_suppression.c",
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/ns_core.c"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/noise_suppression.c",
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/ns_core.c"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -220,4 +320,45 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/ns_core.c"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/noise_suppression_x.c",
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/nsx_core.c",
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/nsx_core_c.c"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/noise_suppression.c",
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/ns_core.c"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/noise_suppression.c",
>++        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/ns_core.c"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("audio_processing_c_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_gn/moz.build
>+index e3edf3cdf71a..ff5e99ac55ba 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_gn/moz.build
>+@@ -146,6 +146,21 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_NS_FLOAT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -160,6 +175,22 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_NS_FLOAT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_NS_FLOAT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -198,6 +229,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -227,6 +274,36 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+ 
>+     DEFINES["WEBRTC_NS_FLOAT"] = True
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++    DEFINES["WEBRTC_NS_FIXED"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++    DEFINES["WEBRTC_NS_FLOAT"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_NS_FLOAT"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -252,4 +329,34 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+ 
>+     DEFINES["WEBRTC_NS_FLOAT"] = True
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++    DEFINES["WEBRTC_NS_FIXED"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++    DEFINES["WEBRTC_NS_FLOAT"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_NS_FLOAT"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("audio_processing_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_c_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_c_gn/moz.build
>+index 39b9d200a0f0..d602d2a62a33 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_c_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_c_gn/moz.build
>+@@ -10,25 +10,15 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>+ COMPILE_FLAGS["STL"] = []
>+ AllowCompilerWarnings()
>+ 
>+-DEFINES["ANDROID"] = True
>+-DEFINES["ANDROID_NDK_VERSION"] = "r12b"
>+ DEFINES["CHROMIUM_BUILD"] = True
>+-DEFINES["DISABLE_NACL"] = True
>+ DEFINES["EXPAT_RELATIVE_PATH"] = True
>+-DEFINES["HAVE_SYS_UIO_H"] = True
>+-DEFINES["NO_TCMALLOC"] = True
>+-DEFINES["USE_OPENSSL_CERTS"] = "1"
>+ DEFINES["V8_DEPRECATION_WARNINGS"] = True
>+-DEFINES["WEBRTC_ANDROID"] = True
>+-DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+ DEFINES["WEBRTC_HAS_NEON"] = True
>+ DEFINES["WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE"] = True
>+-DEFINES["WEBRTC_LINUX"] = True
>+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+ DEFINES["WEBRTC_POSIX"] = True
>+ DEFINES["WEBRTC_RESTRICT_LOGGING"] = True
>+ DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-DEFINES["__GNU_SOURCE"] = "1"
>+ 
>+ FINAL_LIBRARY = "webrtc"
>+ 
>+@@ -40,10 +30,6 @@ LOCAL_INCLUDES += [
>+     "/media/webrtc/trunk/"
>+ ]
>+ 
>+-OS_LIBS += [
>+-    "log"
>+-]
>+-
>+ UNIFIED_SOURCES += [
>+     "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/nsx_core_neon.c"
>+ ]
>+@@ -60,6 +46,29 @@ if CONFIG["MOZ_DEBUG"] == "1":
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+     DEFINES["WTF_USE_DYNAMIC_ANNOTATIONS"] = "1"
>+ 
>++if CONFIG["OS_TARGET"] == "Android":
>++
>++    DEFINES["ANDROID"] = True
>++    DEFINES["ANDROID_NDK_VERSION"] = "r12b"
>++    DEFINES["DISABLE_NACL"] = True
>++    DEFINES["HAVE_SYS_UIO_H"] = True
>++    DEFINES["NO_TCMALLOC"] = True
>++    DEFINES["USE_OPENSSL_CERTS"] = "1"
>++    DEFINES["WEBRTC_ANDROID"] = True
>++    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>++    DEFINES["WEBRTC_LINUX"] = True
>++    DEFINES["__GNU_SOURCE"] = "1"
>++
>++    OS_LIBS += [
>++        "log"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_BSD"] = True
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+diff --git media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_gn/moz.build
>+index 4a1c0e0d2273..40fa6f57e04e 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_gn/moz.build
>+@@ -10,26 +10,16 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>+ COMPILE_FLAGS["STL"] = []
>+ AllowCompilerWarnings()
>+ 
>+-DEFINES["ANDROID"] = True
>+-DEFINES["ANDROID_NDK_VERSION"] = "r12b"
>+ DEFINES["CHROMIUM_BUILD"] = True
>+-DEFINES["DISABLE_NACL"] = True
>+ DEFINES["EXPAT_RELATIVE_PATH"] = True
>+-DEFINES["HAVE_SYS_UIO_H"] = True
>+-DEFINES["NO_TCMALLOC"] = True
>+-DEFINES["USE_OPENSSL_CERTS"] = "1"
>+ DEFINES["V8_DEPRECATION_WARNINGS"] = True
>+-DEFINES["WEBRTC_ANDROID"] = True
>+-DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+ DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
>+ DEFINES["WEBRTC_HAS_NEON"] = True
>+ DEFINES["WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE"] = True
>+-DEFINES["WEBRTC_LINUX"] = True
>+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+ DEFINES["WEBRTC_POSIX"] = True
>+ DEFINES["WEBRTC_RESTRICT_LOGGING"] = True
>+ DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-DEFINES["__GNU_SOURCE"] = "1"
>+ 
>+ FINAL_LIBRARY = "webrtc"
>+ 
>+@@ -44,10 +34,6 @@ LOCAL_INCLUDES += [
>+     "/media/webrtc/trunk/webrtc/common_audio/vad/include/"
>+ ]
>+ 
>+-OS_LIBS += [
>+-    "log"
>+-]
>+-
>+ UNIFIED_SOURCES += [
>+     "/media/webrtc/trunk/webrtc/modules/audio_processing/aec/aec_core_neon.cc",
>+     "/media/webrtc/trunk/webrtc/modules/audio_processing/aecm/aecm_core_neon.cc",
>+@@ -66,6 +52,29 @@ if CONFIG["MOZ_DEBUG"] == "1":
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+     DEFINES["WTF_USE_DYNAMIC_ANNOTATIONS"] = "1"
>+ 
>++if CONFIG["OS_TARGET"] == "Android":
>++
>++    DEFINES["ANDROID"] = True
>++    DEFINES["ANDROID_NDK_VERSION"] = "r12b"
>++    DEFINES["DISABLE_NACL"] = True
>++    DEFINES["HAVE_SYS_UIO_H"] = True
>++    DEFINES["NO_TCMALLOC"] = True
>++    DEFINES["USE_OPENSSL_CERTS"] = "1"
>++    DEFINES["WEBRTC_ANDROID"] = True
>++    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>++    DEFINES["WEBRTC_LINUX"] = True
>++    DEFINES["__GNU_SOURCE"] = "1"
>++
>++    OS_LIBS += [
>++        "log"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_BSD"] = True
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+diff --git media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn/moz.build media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn/moz.build
>+index fe7edf21124f..a89cdfbd0833 100644
>+--- media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn/moz.build
>+@@ -76,6 +76,28 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     CXXFLAGS += [
>+@@ -88,6 +110,29 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2",
>++        "-msse2"
>++    ]
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -121,6 +166,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+diff --git media/webrtc/trunk/webrtc/modules/bitrate_controller/bitrate_controller_gn/moz.build media/webrtc/trunk/webrtc/modules/bitrate_controller/bitrate_controller_gn/moz.build
>+index 353de9772938..5aadfd7e43b6 100644
>+--- media/webrtc/trunk/webrtc/modules/bitrate_controller/bitrate_controller_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/bitrate_controller/bitrate_controller_gn/moz.build
>+@@ -76,6 +76,22 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "-framework CoreVideo"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -89,6 +105,22 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -126,6 +158,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -151,6 +199,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -172,4 +243,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("bitrate_controller_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/congestion_controller/congestion_controller_gn/moz.build media/webrtc/trunk/webrtc/modules/congestion_controller/congestion_controller_gn/moz.build
>+index c8e95f77d856..8c394bbe6907 100644
>+--- media/webrtc/trunk/webrtc/modules/congestion_controller/congestion_controller_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/congestion_controller/congestion_controller_gn/moz.build
>+@@ -85,6 +85,22 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "-framework CoreVideo"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -99,6 +115,22 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -136,6 +168,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -161,6 +209,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -182,4 +253,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("congestion_controller_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
>+index dd67efb43394..c572170b6bc4 100644
>+--- media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
>+@@ -54,6 +54,28 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     CXXFLAGS += [
>+@@ -66,6 +88,29 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2",
>++        "-msse2"
>++    ]
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -95,6 +140,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+diff --git media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn/moz.build media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn/moz.build
>+index d72c4a24a555..01ba0b15f58f 100644
>+--- media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn/moz.build
>+@@ -81,6 +81,70 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_mac.mm"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    OS_LIBS += [
>++        "X11",
>++        "X11-xcb",
>++        "xcb",
>++        "Xcomposite",
>++        "Xcursor",
>++        "Xdamage",
>++        "Xext",
>++        "Xfixes",
>++        "Xi",
>++        "Xrender"
>++    ]
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_x11.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_x11.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_x11.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/desktop_device_info_x11.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/shared_x_display.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/shared_x_util.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_error_trap.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    OS_LIBS += [
>++        "X11",
>++        "X11-xcb",
>++        "xcb",
>++        "Xcomposite",
>++        "Xcursor",
>++        "Xdamage",
>++        "Xext",
>++        "Xfixes",
>++        "Xi",
>++        "Xrender"
>++    ]
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_x11.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_x11.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_x11.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/desktop_device_info_x11.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/shared_x_display.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/shared_x_util.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_error_trap.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -115,6 +179,70 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    OS_LIBS += [
>++        "X11",
>++        "X11-xcb",
>++        "xcb",
>++        "Xcomposite",
>++        "Xcursor",
>++        "Xdamage",
>++        "Xext",
>++        "Xfixes",
>++        "Xi",
>++        "Xrender"
>++    ]
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_x11.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_x11.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_x11.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/desktop_device_info_x11.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/shared_x_display.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/shared_x_util.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_error_trap.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    OS_LIBS += [
>++        "X11",
>++        "X11-xcb",
>++        "xcb",
>++        "Xcomposite",
>++        "Xcursor",
>++        "Xdamage",
>++        "Xext",
>++        "Xfixes",
>++        "Xi",
>++        "Xrender"
>++    ]
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_x11.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_x11.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_x11.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/desktop_device_info_x11.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/shared_x_display.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/shared_x_util.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_error_trap.cc",
>++        "/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -179,8 +307,70 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("desktop_capture_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn/moz.build media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn/moz.build
>+index 94a38d140a50..9833d58b7912 100644
>+--- media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn/moz.build
>+@@ -54,6 +54,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -62,6 +76,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -91,8 +119,70 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("primitives_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/media_file/media_file_gn/moz.build media/webrtc/trunk/webrtc/modules/media_file/media_file_gn/moz.build
>+index c70918aac75f..a5d5b72590d5 100644
>+--- media/webrtc/trunk/webrtc/modules/media_file/media_file_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/media_file/media_file_gn/moz.build
>+@@ -73,6 +73,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -85,6 +99,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -122,6 +150,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -147,6 +191,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -168,4 +235,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("media_file_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/pacing/pacing_gn/moz.build media/webrtc/trunk/webrtc/modules/pacing/pacing_gn/moz.build
>+index 9af6ee9cf1d3..018b0aa93770 100644
>+--- media/webrtc/trunk/webrtc/modules/pacing/pacing_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/pacing/pacing_gn/moz.build
>+@@ -77,6 +77,22 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "-framework CoreVideo"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -90,6 +106,22 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -127,6 +159,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -152,6 +200,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -173,4 +244,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("pacing_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build media/webrtc/trunk/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
>+index 723b4c2223cb..3e085e54c5f1 100644
>+--- media/webrtc/trunk/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
>+@@ -81,6 +81,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -93,6 +107,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -130,6 +158,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -155,6 +199,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -176,4 +243,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("remote_bitrate_estimator_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build media/webrtc/trunk/webrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
>+index 7b8dcb4c2707..0cc6b4c46493 100644
>+--- media/webrtc/trunk/webrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
>+@@ -147,6 +147,22 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "-framework CoreVideo"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -160,6 +176,22 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -197,6 +229,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -222,6 +270,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -243,4 +314,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("rtp_rtcp_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/utility/utility_gn/moz.build media/webrtc/trunk/webrtc/modules/utility/utility_gn/moz.build
>+index 08a7e1fc9c6c..bc04455ccaf3 100644
>+--- media/webrtc/trunk/webrtc/modules/utility/utility_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/utility/utility_gn/moz.build
>+@@ -80,6 +80,22 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -94,6 +110,22 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -131,6 +163,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -156,6 +204,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -177,4 +248,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("utility_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build media/webrtc/trunk/webrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
>+index a901d9c822aa..00460b2c29b1 100644
>+--- media/webrtc/trunk/webrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
>+@@ -91,6 +91,32 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "/media/webrtc/trunk/webrtc/modules/video_capture/mac/video_capture_mac.mm"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc",
>++        "/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc",
>++        "/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -110,6 +136,32 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc",
>++        "/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc",
>++        "/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -165,6 +217,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -190,6 +258,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -211,4 +302,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("video_capture_internal_impl_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/video_capture/video_capture_module_gn/moz.build media/webrtc/trunk/webrtc/modules/video_capture/video_capture_module_gn/moz.build
>+index 15e9bea6a7c7..17d66d50a1c9 100644
>+--- media/webrtc/trunk/webrtc/modules/video_capture/video_capture_module_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/video_capture/video_capture_module_gn/moz.build
>+@@ -78,6 +78,22 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "-framework CoreVideo"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -92,6 +108,22 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -129,6 +161,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -154,6 +202,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -175,4 +246,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("video_capture_module_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/video_coding/video_coding_gn/moz.build media/webrtc/trunk/webrtc/modules/video_coding/video_coding_gn/moz.build
>+index 303d07665a24..b10798ed3878 100644
>+--- media/webrtc/trunk/webrtc/modules/video_coding/video_coding_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/video_coding/video_coding_gn/moz.build
>+@@ -106,6 +106,22 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "-framework CoreVideo"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -120,6 +136,22 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -157,6 +189,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -182,6 +230,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -203,4 +274,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("video_coding_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/video_coding/video_coding_utility_gn/moz.build media/webrtc/trunk/webrtc/modules/video_coding/video_coding_utility_gn/moz.build
>+index 6614266d7654..38ed790ffd0e 100644
>+--- media/webrtc/trunk/webrtc/modules/video_coding/video_coding_utility_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/video_coding/video_coding_utility_gn/moz.build
>+@@ -83,6 +83,22 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "-framework CoreVideo"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -96,6 +112,22 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -133,6 +165,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -158,6 +206,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -179,4 +250,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("video_coding_utility_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/video_coding/webrtc_h264_gn/moz.build media/webrtc/trunk/webrtc/modules/video_coding/webrtc_h264_gn/moz.build
>+index 09b1bfe37d70..b47a2fcc234d 100644
>+--- media/webrtc/trunk/webrtc/modules/video_coding/webrtc_h264_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/video_coding/webrtc_h264_gn/moz.build
>+@@ -74,6 +74,22 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "-framework CoreVideo"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -87,6 +103,22 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -124,6 +156,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -149,6 +197,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -170,4 +241,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("webrtc_h264_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/video_coding/webrtc_i420_gn/moz.build media/webrtc/trunk/webrtc/modules/video_coding/webrtc_i420_gn/moz.build
>+index d4f207e3e2ac..d66c46e99947 100644
>+--- media/webrtc/trunk/webrtc/modules/video_coding/webrtc_i420_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/video_coding/webrtc_i420_gn/moz.build
>+@@ -76,6 +76,22 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "-framework CoreVideo"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -89,6 +105,22 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -126,6 +158,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -151,6 +199,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -172,4 +243,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("webrtc_i420_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/video_coding/webrtc_vp8_gn/moz.build media/webrtc/trunk/webrtc/modules/video_coding/webrtc_vp8_gn/moz.build
>+index c58da7783bed..339b18f51139 100644
>+--- media/webrtc/trunk/webrtc/modules/video_coding/webrtc_vp8_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/video_coding/webrtc_vp8_gn/moz.build
>+@@ -82,6 +82,22 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "-framework CoreVideo"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -95,6 +111,22 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -132,6 +164,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -157,6 +205,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -178,4 +249,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("webrtc_vp8_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/video_coding/webrtc_vp9_gn/moz.build media/webrtc/trunk/webrtc/modules/video_coding/webrtc_vp9_gn/moz.build
>+index c11cca092da4..1da9d808ceb4 100644
>+--- media/webrtc/trunk/webrtc/modules/video_coding/webrtc_vp9_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/video_coding/webrtc_vp9_gn/moz.build
>+@@ -78,6 +78,22 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "-framework CoreVideo"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -91,6 +107,22 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -128,6 +160,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -153,6 +201,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -174,4 +245,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("webrtc_vp9_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/video_processing/video_processing_gn/moz.build media/webrtc/trunk/webrtc/modules/video_processing/video_processing_gn/moz.build
>+index 6e662cae7e7e..ee570616ba4e 100644
>+--- media/webrtc/trunk/webrtc/modules/video_processing/video_processing_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/video_processing/video_processing_gn/moz.build
>+@@ -84,6 +84,22 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "-framework CoreVideo"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -98,6 +114,22 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -135,6 +167,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -160,6 +208,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -181,4 +252,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("video_processing_gn")
>+diff --git media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn/moz.build media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn/moz.build
>+index 445650899304..fae947a2e8ec 100644
>+--- media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn/moz.build
>+@@ -10,25 +10,15 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>+ COMPILE_FLAGS["STL"] = []
>+ AllowCompilerWarnings()
>+ 
>+-DEFINES["ANDROID"] = True
>+-DEFINES["ANDROID_NDK_VERSION"] = "r12b"
>+ DEFINES["CHROMIUM_BUILD"] = True
>+-DEFINES["DISABLE_NACL"] = True
>+ DEFINES["EXPAT_RELATIVE_PATH"] = True
>+-DEFINES["HAVE_SYS_UIO_H"] = True
>+-DEFINES["NO_TCMALLOC"] = True
>+-DEFINES["USE_OPENSSL_CERTS"] = "1"
>+ DEFINES["V8_DEPRECATION_WARNINGS"] = True
>+-DEFINES["WEBRTC_ANDROID"] = True
>+-DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+ DEFINES["WEBRTC_HAS_NEON"] = True
>+ DEFINES["WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE"] = True
>+-DEFINES["WEBRTC_LINUX"] = True
>+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+ DEFINES["WEBRTC_POSIX"] = True
>+ DEFINES["WEBRTC_RESTRICT_LOGGING"] = True
>+ DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-DEFINES["__GNU_SOURCE"] = "1"
>+ 
>+ FINAL_LIBRARY = "webrtc"
>+ 
>+@@ -56,6 +46,25 @@ if CONFIG["MOZ_DEBUG"] == "1":
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+     DEFINES["WTF_USE_DYNAMIC_ANNOTATIONS"] = "1"
>+ 
>++if CONFIG["OS_TARGET"] == "Android":
>++
>++    DEFINES["ANDROID"] = True
>++    DEFINES["ANDROID_NDK_VERSION"] = "r12b"
>++    DEFINES["DISABLE_NACL"] = True
>++    DEFINES["HAVE_SYS_UIO_H"] = True
>++    DEFINES["NO_TCMALLOC"] = True
>++    DEFINES["USE_OPENSSL_CERTS"] = "1"
>++    DEFINES["WEBRTC_ANDROID"] = True
>++    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>++    DEFINES["WEBRTC_LINUX"] = True
>++    DEFINES["__GNU_SOURCE"] = "1"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_BSD"] = True
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+diff --git media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn/moz.build media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn/moz.build
>+index 9815b7305a45..9f7e2024e602 100644
>+--- media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn/moz.build
>++++ media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn/moz.build
>+@@ -78,6 +78,28 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     CXXFLAGS += [
>+@@ -94,6 +116,29 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2",
>++        "-msse2"
>++    ]
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -131,6 +176,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+diff --git media/webrtc/trunk/webrtc/system_wrappers/field_trial_default_gn/moz.build media/webrtc/trunk/webrtc/system_wrappers/field_trial_default_gn/moz.build
>+index 00d248dfcf68..700daf4ecd88 100644
>+--- media/webrtc/trunk/webrtc/system_wrappers/field_trial_default_gn/moz.build
>++++ media/webrtc/trunk/webrtc/system_wrappers/field_trial_default_gn/moz.build
>+@@ -65,6 +65,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -73,6 +87,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -106,6 +134,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -131,6 +175,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -152,4 +219,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("field_trial_default_gn")
>+diff --git media/webrtc/trunk/webrtc/system_wrappers/metrics_default_gn/moz.build media/webrtc/trunk/webrtc/system_wrappers/metrics_default_gn/moz.build
>+index 8550ddf940ba..14245f797eaa 100644
>+--- media/webrtc/trunk/webrtc/system_wrappers/metrics_default_gn/moz.build
>++++ media/webrtc/trunk/webrtc/system_wrappers/metrics_default_gn/moz.build
>+@@ -65,6 +65,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -73,6 +87,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -106,6 +134,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -131,6 +175,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -152,4 +219,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("metrics_default_gn")
>+diff --git media/webrtc/trunk/webrtc/system_wrappers/system_wrappers_gn/moz.build media/webrtc/trunk/webrtc/system_wrappers/system_wrappers_gn/moz.build
>+index c69215b4e91e..61bbdd44c60b 100644
>+--- media/webrtc/trunk/webrtc/system_wrappers/system_wrappers_gn/moz.build
>++++ media/webrtc/trunk/webrtc/system_wrappers/system_wrappers_gn/moz.build
>+@@ -103,6 +103,36 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "/media/webrtc/trunk/webrtc/system_wrappers/source/trace_posix.cc"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["WEBRTC_THREAD_RR"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc",
>++        "/media/webrtc/trunk/webrtc/system_wrappers/source/event_timer_posix.cc",
>++        "/media/webrtc/trunk/webrtc/system_wrappers/source/rw_lock_posix.cc",
>++        "/media/webrtc/trunk/webrtc/system_wrappers/source/trace_posix.cc"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["WEBRTC_THREAD_RR"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc",
>++        "/media/webrtc/trunk/webrtc/system_wrappers/source/event_timer_posix.cc",
>++        "/media/webrtc/trunk/webrtc/system_wrappers/source/rw_lock_posix.cc",
>++        "/media/webrtc/trunk/webrtc/system_wrappers/source/trace_posix.cc"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -123,6 +153,36 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "/media/webrtc/trunk/webrtc/system_wrappers/source/trace_posix.cc"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["WEBRTC_THREAD_RR"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc",
>++        "/media/webrtc/trunk/webrtc/system_wrappers/source/event_timer_posix.cc",
>++        "/media/webrtc/trunk/webrtc/system_wrappers/source/rw_lock_posix.cc",
>++        "/media/webrtc/trunk/webrtc/system_wrappers/source/trace_posix.cc"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["WEBRTC_THREAD_RR"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    UNIFIED_SOURCES += [
>++        "/media/webrtc/trunk/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc",
>++        "/media/webrtc/trunk/webrtc/system_wrappers/source/event_timer_posix.cc",
>++        "/media/webrtc/trunk/webrtc/system_wrappers/source/rw_lock_posix.cc",
>++        "/media/webrtc/trunk/webrtc/system_wrappers/source/trace_posix.cc"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -169,6 +229,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -194,6 +270,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -215,4 +314,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("system_wrappers_gn")
>+diff --git media/webrtc/trunk/webrtc/video/video_gn/moz.build media/webrtc/trunk/webrtc/video/video_gn/moz.build
>+index 87f39409c276..4632948283d5 100644
>+--- media/webrtc/trunk/webrtc/video/video_gn/moz.build
>++++ media/webrtc/trunk/webrtc/video/video_gn/moz.build
>+@@ -104,6 +104,22 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "-framework CoreVideo"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -119,6 +135,22 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -160,6 +192,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -185,6 +233,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -206,4 +277,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("video_gn")
>+diff --git media/webrtc/trunk/webrtc/video_engine/video_engine_gn/moz.build media/webrtc/trunk/webrtc/video_engine/video_engine_gn/moz.build
>+index 48331e196f20..d135f0fcc9dc 100644
>+--- media/webrtc/trunk/webrtc/video_engine/video_engine_gn/moz.build
>++++ media/webrtc/trunk/webrtc/video_engine/video_engine_gn/moz.build
>+@@ -50,6 +50,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -58,6 +72,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -87,8 +115,70 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("video_engine_gn")
>+diff --git media/webrtc/trunk/webrtc/voice_engine/audio_coder_gn/moz.build media/webrtc/trunk/webrtc/voice_engine/audio_coder_gn/moz.build
>+index 81ede819424b..30c581867870 100644
>+--- media/webrtc/trunk/webrtc/voice_engine/audio_coder_gn/moz.build
>++++ media/webrtc/trunk/webrtc/voice_engine/audio_coder_gn/moz.build
>+@@ -71,6 +71,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -84,6 +98,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -121,6 +149,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -146,6 +190,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -167,4 +234,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("audio_coder_gn")
>+diff --git media/webrtc/trunk/webrtc/voice_engine/file_player_gn/moz.build media/webrtc/trunk/webrtc/voice_engine/file_player_gn/moz.build
>+index df9a45d29ab1..ce08220befb5 100644
>+--- media/webrtc/trunk/webrtc/voice_engine/file_player_gn/moz.build
>++++ media/webrtc/trunk/webrtc/voice_engine/file_player_gn/moz.build
>+@@ -72,6 +72,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -85,6 +99,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -122,6 +150,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -147,6 +191,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -168,4 +235,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("file_player_gn")
>+diff --git media/webrtc/trunk/webrtc/voice_engine/file_recorder_gn/moz.build media/webrtc/trunk/webrtc/voice_engine/file_recorder_gn/moz.build
>+index a5c44363240a..8c9fdf6bf428 100644
>+--- media/webrtc/trunk/webrtc/voice_engine/file_recorder_gn/moz.build
>++++ media/webrtc/trunk/webrtc/voice_engine/file_recorder_gn/moz.build
>+@@ -72,6 +72,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -85,6 +99,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -122,6 +150,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -147,6 +191,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -168,4 +235,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("file_recorder_gn")
>+diff --git media/webrtc/trunk/webrtc/voice_engine/level_indicator_gn/moz.build media/webrtc/trunk/webrtc/voice_engine/level_indicator_gn/moz.build
>+index 1e7f16de23f6..fc42a835670d 100644
>+--- media/webrtc/trunk/webrtc/voice_engine/level_indicator_gn/moz.build
>++++ media/webrtc/trunk/webrtc/voice_engine/level_indicator_gn/moz.build
>+@@ -72,6 +72,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -84,6 +98,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -121,6 +149,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -146,6 +190,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -167,4 +234,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("level_indicator_gn")
>+diff --git media/webrtc/trunk/webrtc/voice_engine/voice_engine_gn/moz.build media/webrtc/trunk/webrtc/voice_engine/voice_engine_gn/moz.build
>+index f56d8f9ec837..ad53d284e41d 100644
>+--- media/webrtc/trunk/webrtc/voice_engine/voice_engine_gn/moz.build
>++++ media/webrtc/trunk/webrtc/voice_engine/voice_engine_gn/moz.build
>+@@ -109,6 +109,22 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "-framework CoreVideo"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -124,6 +140,22 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "rt"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -166,6 +198,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -191,6 +239,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -212,4 +283,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("voice_engine_gn")
>+diff --git media/webrtc/trunk/webrtc/webrtc_common_gn/moz.build media/webrtc/trunk/webrtc/webrtc_common_gn/moz.build
>+index d2edfc09f5bc..3e0bfc943f3c 100644
>+--- media/webrtc/trunk/webrtc/webrtc_common_gn/moz.build
>++++ media/webrtc/trunk/webrtc/webrtc_common_gn/moz.build
>+@@ -66,6 +66,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -74,6 +88,20 @@ if CONFIG["OS_TARGET"] == "Linux":
>+     DEFINES["WEBRTC_POSIX"] = True
>+     DEFINES["_FILE_OFFSET_BITS"] = "64"
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -107,6 +135,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -132,6 +176,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -153,4 +220,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("webrtc_common_gn")
>+diff --git media/webrtc/trunk/webrtc/webrtc_gn/moz.build media/webrtc/trunk/webrtc/webrtc_gn/moz.build
>+index 4e5bca5fc11a..59bc60117eb6 100644
>+--- media/webrtc/trunk/webrtc/webrtc_gn/moz.build
>++++ media/webrtc/trunk/webrtc/webrtc_gn/moz.build
>+@@ -96,6 +96,48 @@ if CONFIG["OS_TARGET"] == "Darwin":
>+         "-framework OpenGL"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    OS_LIBS += [
>++        "X11",
>++        "X11-xcb",
>++        "xcb",
>++        "Xcomposite",
>++        "Xcursor",
>++        "Xdamage",
>++        "Xext",
>++        "Xfixes",
>++        "Xi",
>++        "Xrender"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    OS_LIBS += [
>++        "X11",
>++        "X11-xcb",
>++        "xcb",
>++        "Xcomposite",
>++        "Xcursor",
>++        "Xdamage",
>++        "Xext",
>++        "Xfixes",
>++        "Xi",
>++        "Xrender"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "Linux":
>+ 
>+     DEFINES["USE_NSS_CERTS"] = "1"
>+@@ -121,6 +163,48 @@ if CONFIG["OS_TARGET"] == "Linux":
>+         "Xrender"
>+     ]
>+ 
>++if CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    OS_LIBS += [
>++        "X11",
>++        "X11-xcb",
>++        "xcb",
>++        "Xcomposite",
>++        "Xcursor",
>++        "Xdamage",
>++        "Xext",
>++        "Xfixes",
>++        "Xi",
>++        "Xrender"
>++    ]
>++
>++if CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++    DEFINES["WEBRTC_BSD"] = True
>++    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
>++    DEFINES["WEBRTC_POSIX"] = True
>++    DEFINES["_FILE_OFFSET_BITS"] = "64"
>++
>++    OS_LIBS += [
>++        "X11",
>++        "X11-xcb",
>++        "xcb",
>++        "Xcomposite",
>++        "Xcursor",
>++        "Xdamage",
>++        "Xext",
>++        "Xfixes",
>++        "Xi",
>++        "Xrender"
>++    ]
>++
>+ if CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+@@ -165,6 +249,22 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
>+ 
>+     DEFINES["_FORTIFY_SOURCE"] = "2"
>+ 
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "DragonFly":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    DEFINES["_FORTIFY_SOURCE"] = "2"
>++
>+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+ 
>+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+@@ -190,6 +290,29 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not C
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+@@ -211,4 +334,27 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFI
>+         "-msse2"
>+     ]
>+ 
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["WEBRTC_ARCH_ARM64"] = True
>++    DEFINES["WEBRTC_HAS_NEON"] = True
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "NetBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>++
>++    CXXFLAGS += [
>++        "-msse2"
>++    ]
>++
>+ Library("webrtc_gn")
>diff --git a/www/firefox/files/patch-bug1442791 b/www/firefox/files/patch-bug1442791
>new file mode 100644
>index 000000000000..fe097d8375d2
>--- /dev/null
>+++ b/www/firefox/files/patch-bug1442791
>@@ -0,0 +1,33 @@
>+Build Linux version of GetExecutablePathImpl() on other Unix systems
>+    
>+ANGLE system_utils* are unused in Gecko.
>+https://searchfox.org/mozilla-central/search?regexp=true&q=\bGetExecutable%28Path%7CDirectory%29\B
>+
>+diff --git gfx/angle/targets/angle_common/moz.build gfx/angle/targets/angle_common/moz.build
>+index bd4b743ec0dd..3c0dbfae491a 100644
>+--- gfx/angle/targets/angle_common/moz.build
>++++ gfx/angle/targets/angle_common/moz.build
>+@@ -118,17 +118,17 @@ SOURCES += [
>+     '../../checkout/src/common/uniform_type_info_autogen.cpp',
>+     '../../checkout/src/common/utilities.cpp',
>+ ]
>+-if CONFIG['OS_ARCH'] == 'Darwin':
>++if CONFIG['OS_ARCH'] == 'WINNT':
>+     SOURCES += [
>+-        '../../checkout/src/common/system_utils_mac.cpp',
>++        '../../checkout/src/common/system_utils_win.cpp',
>+     ]
>+-if CONFIG['OS_ARCH'] == 'Linux':
>++elif CONFIG['OS_ARCH'] == 'Darwin':
>+     SOURCES += [
>+-        '../../checkout/src/common/system_utils_linux.cpp',
>++        '../../checkout/src/common/system_utils_mac.cpp',
>+     ]
>+-if CONFIG['OS_ARCH'] == 'WINNT':
>++else: # Android, Linux, BSDs, etc.
>+     SOURCES += [
>+-        '../../checkout/src/common/system_utils_win.cpp',
>++        '../../checkout/src/common/system_utils_linux.cpp',
>+     ]
>+ #
>+ #LDFLAGS += [
>diff --git a/www/firefox/files/patch-bug1444074 b/www/firefox/files/patch-bug1444074
>deleted file mode 100644
>index bdb45963a40c..000000000000
>--- a/www/firefox/files/patch-bug1444074
>+++ /dev/null
>@@ -1,34 +0,0 @@
>-Enable full-duplex by default for all platforms
>-
>-diff --git modules/libpref/init/all.js modules/libpref/init/all.js
>-index a152e4944e95..322d009da739 100644
>---- modules/libpref/init/all.js
>-+++ modules/libpref/init/all.js
>-@@ -557,25 +557,18 @@ pref("media.getusermedia.agc", 3); // kAgcAdaptiveDigital
>- // capture_delay: Adjustments for OS-specific input delay (lower bound)
>- // playout_delay: Adjustments for OS-specific AudioStream+cubeb+output delay (lower bound)
>- // full_duplex: enable cubeb full-duplex capture/playback
>-+pref("media.navigator.audio.full_duplex", true);
>- #if defined(XP_MACOSX)
>- pref("media.peerconnection.capture_delay", 50);
>--pref("media.navigator.audio.full_duplex", true);
>- #elif defined(XP_WIN)
>- pref("media.peerconnection.capture_delay", 50);
>--pref("media.navigator.audio.full_duplex", true);
>- #elif defined(ANDROID)
>- pref("media.peerconnection.capture_delay", 100);
>--pref("media.navigator.audio.full_duplex", true);
>- pref("media.navigator.hardware.vp8_encode.acceleration_enabled", true);
>- pref("media.navigator.hardware.vp8_encode.acceleration_remote_enabled", true);
>- pref("media.navigator.hardware.vp8_decode.acceleration_enabled", false);
>--#elif defined(XP_LINUX) || defined(MOZ_SNDIO)
>--pref("media.peerconnection.capture_delay", 70);
>--pref("media.navigator.audio.full_duplex", true);
>- #else
>--// *BSD, others - merely a guess for now
>--pref("media.peerconnection.capture_delay", 50);
>--pref("media.navigator.audio.full_duplex", false);
>-+pref("media.peerconnection.capture_delay", 70);
>- #endif
>- // Use MediaDataDecoder API for WebRTC, this includes hardware acceleration for
>- // decoding.
>diff --git a/www/firefox/files/patch-bug1444083 b/www/firefox/files/patch-bug1444083
>deleted file mode 100644
>index 9163fe84acb6..000000000000
>--- a/www/firefox/files/patch-bug1444083
>+++ /dev/null
>@@ -1,17 +0,0 @@
>-Disable custom styling for <select> and <option> on Tier3 as well
>-
>-diff --git modules/libpref/init/all.js modules/libpref/init/all.js
>-index 322d009da739..06e2fd7f664a 100644
>---- modules/libpref/init/all.js
>-+++ modules/libpref/init/all.js
>-@@ -1359,8 +1359,8 @@ pref("dom.forms.autocomplete.formautofill", false);
>- // Enable search in <select> dropdowns (more than 40 options)
>- pref("dom.forms.selectSearch", false);
>- // Allow for webpages to provide custom styling for <select>
>--// popups. Disabled on Linux due to bug 1338283.
>--#ifdef XP_LINUX
>-+// popups. Disabled on GTK due to bug 1338283.
>-+#ifdef MOZ_WIDGET_GTK
>- pref("dom.forms.select.customstyling", false);
>- #else
>- pref("dom.forms.select.customstyling", true);
>diff --git a/www/firefox/files/patch-bug826985 b/www/firefox/files/patch-bug826985
>deleted file mode 100644
>index 69a51707c051..000000000000
>--- a/www/firefox/files/patch-bug826985
>+++ /dev/null
>@@ -1,171 +0,0 @@
>-commit 8024d93
>-Author: Henrik Gulbrandsen <henrik@gulbra.net>
>-Date:   Fri Jan 4 13:49:22 2013 +0100
>-
>-    Bug 826985 - Support more video formats for WebRTC via libv4l2 on Linux.
>----
>- config/system-headers                                   |  1 +
>- old-configure.in                                        |  7 +++++++
>- media/webrtc/signaling/test/Makefile.in                 |  1 +
>- .../modules/video_capture/linux/device_info_linux.cc    | 17 +++++++++++++++++
>- .../modules/video_capture/linux/video_capture_linux.cc  | 16 +++++++++++++++-
>- .../webrtc/modules/video_capture/video_capture.gypi     | 11 +++++++++++
>- toolkit/library/Makefile.in                             |  1 +
>- 6 files changed, 52 insertions(+), 1 deletion(-)
>-
>-diff --git config/system-headers.mozbuild config/system-headers.mozbuild
>-index e02d381a12e9..7620b4d00623 100644
>---- config/system-headers.mozbuild
>-+++ config/system-headers.mozbuild
>-@@ -428,6 +428,7 @@ system_headers = [
>-     'libgnomeui/gnome-icon-theme.h',
>-     'libgnomeui/gnome-ui-init.h',
>-     'libutil.h',
>-+    'libv4l2.h',
>-     'limits.h',
>-     'link.h',
>-     'linux/ioprio.h',
>-diff --git old-configure.in configure.in
>-index 55e4cd1..76567b3 100644
>---- old-configure.in
>-+++ old-configure.in
>-@@ -2558,6 +2558,9 @@ if test -n "$MOZ_WEBRTC"; then
>-     if test -n "$MOZ_X11"; then
>-       MOZ_WEBRTC_X11_LIBS="-lXext -lXdamage -lXfixes -lXcomposite"
>-     fi
>-+
>-+    dnl with libv4l2 we can support more cameras
>-+    PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2)
>- else
>-     MOZ_SYNTH_PICO=
>- fi
>-diff --git build/gyp.mozbuild build/gyp.mozbuild
>-index b483cd1..f1dd1f0 100644
>---- build/gyp.mozbuild
>-+++ build/gyp.mozbuild
>-@@ -11,6 +11,7 @@ gyp_vars = {
>-     'have_ethtool_cmd_speed_hi': 1 if CONFIG['MOZ_WEBRTC_HAVE_ETHTOOL_SPEED_HI'] else 0,
>-     'include_alsa_audio': 1 if CONFIG['MOZ_ALSA'] else 0,
>-     'include_pulse_audio': 1 if CONFIG['MOZ_PULSEAUDIO'] else 0,
>-+    'use_libv4l2': 1 if CONFIG['MOZ_LIBV4L2_LIBS'] else 0,
>-     # basic stuff for everything
>-     'include_internal_video_render': 0,
>-     'clang_use_chrome_plugins': 0,
>-diff --git media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
>-index 239a292..bab496c 100644
>---- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
>-+++ media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
>-@@ -25,6 +25,9 @@
>- #else
>- #include <linux/videodev2.h>
>- #endif
>-+#ifdef HAVE_LIBV4L2
>-+#include <libv4l2.h>
>-+#endif
>- 
>- #include "webrtc/system_wrappers/interface/ref_count.h"
>- #include "webrtc/system_wrappers/interface/trace.h"
>-@@ -34,6 +37,15 @@
>- #define BUF_LEN     ( 1024 * ( EVENT_SIZE + 16 ) )
>- #endif
>- 
>-+#ifdef HAVE_LIBV4L2
>-+#define open	v4l2_open
>-+#define close	v4l2_close
>-+#define dup	v4l2_dup
>-+#define ioctl	v4l2_ioctl
>-+#define mmap	v4l2_mmap
>-+#define munmap	v4l2_munmap
>-+#endif
>-+
>- namespace webrtc
>- {
>- namespace videocapturemodule
>-@@ -274,6 +286,11 @@ int32_t DeviceInfoLinux::GetDeviceName(
>-     memset(deviceNameUTF8, 0, deviceNameLength);
>-     memcpy(cameraName, cap.card, sizeof(cap.card));
>- 
>-+    if (cameraName[0] == '\0')
>-+    {
>-+        sprintf(cameraName, "Camera at /dev/video%d", deviceNumber);
>-+    }
>-+
>-     if (deviceNameLength >= strlen(cameraName))
>-     {
>-         memcpy(deviceNameUTF8, cameraName, strlen(cameraName));
>-diff --git media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc
>-index 12df1b3..e9863ba 100644
>---- media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc
>-+++ media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc
>-@@ -25,6 +25,9 @@
>- #else
>- #include <linux/videodev2.h>
>- #endif
>-+#ifdef HAVE_LIBV4L2
>-+#include <libv4l2.h>
>-+#endif
>- 
>- #include <new>
>- 
>-@@ -32,6 +35,15 @@
>- #include "webrtc/modules/video_capture/linux/video_capture_linux.h"
>- #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
>- #include "webrtc/system_wrappers/include/trace.h"
>-+
>-+#ifdef HAVE_LIBV4L2
>-+#define open	v4l2_open
>-+#define close	v4l2_close
>-+#define dup	v4l2_dup
>-+#define ioctl	v4l2_ioctl
>-+#define mmap	v4l2_mmap
>-+#define munmap	v4l2_munmap
>-+#endif
>- 
>- namespace webrtc {
>- namespace videocapturemodule {
>-diff --git media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
>-index d46b5aa..e452223 100644
>---- media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
>-+++ media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
>-@@ -7,6 +7,9 @@
>- # be found in the AUTHORS file in the root of the source tree.
>- 
>- {
>-+  'variables': {
>-+     'use_libv4l2%': 0,
>-+  },
>-   'targets': [
>-     {
>-       'target_name': 'video_capture_module',
>-@@ -76,6 +76,19 @@
>-                 'linux/video_capture_linux.cc',
>-                 'linux/video_capture_linux.h',
>-               ],
>-+              'conditions': [
>-+                ['use_libv4l2==1', {
>-+                  'defines': [
>-+                    'HAVE_LIBV4L2',
>-+                  ],
>-+                  'cflags_mozilla': [
>-+                    '$(MOZ_LIBV4L2_CFLAGS)',
>-+                  ],
>-+                  'libraries': [
>-+                    '-lv4l2',
>-+                  ],
>-+                }],
>-+              ],
>-             }],
>-             ['OS=="mac"', {
>-               'sources': [
>-diff --git toolkit/library/moz.build toolkit/library/moz.build
>-index 9c16ffa..1db3794 100644
>---- toolkit/library/moz.build
>-+++ toolkit/library/moz.build
>-@@ -163,6 +163,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF
>-     ]
>- 
>- OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
>-+OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS']
>- OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
>- OS_LIBS += CONFIG['MOZ_APP_EXTRA_LIBS']
>- 
>diff --git a/www/firefox/files/patch-z-bug517422 b/www/firefox/files/patch-z-bug517422
>index a3ce1fe5b450..db617d716b25 100644
>--- a/www/firefox/files/patch-z-bug517422
>+++ b/www/firefox/files/patch-z-bug517422
>@@ -160,7 +160,7 @@ diff --git dom/media/moz.build dom/media/moz.build
> index 86b051c58d33..fb6186dce78b 100644
> --- dom/media/moz.build
> +++ dom/media/moz.build
>-@@ -318,6 +318,21 @@ if CONFIG['MOZ_WEBRTC']:
>+@@ -326,6 +326,21 @@ if CONFIG['MOZ_WEBRTC']:
>  
>  DEFINES['MOZILLA_INTERNAL_API'] = True
>  
>@@ -179,16 +179,16 @@ index 86b051c58d33..fb6186dce78b 100644
> +if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:
> +    CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS']
> +
>- if CONFIG['MOZ_ANDROID_HLS_SUPPORT'] and CONFIG['MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE']:
>+ if CONFIG['MOZ_ANDROID_HLS_SUPPORT']:
>      DEFINES['MOZ_ANDROID_HLS_SUPPORT'] = True
>  
> diff --git dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp
> index 078f6ea5ef60..c600db067539 100644
> --- dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp
> +++ dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp
>-@@ -11,9 +11,13 @@
>- #include "prmem.h"
>- #include "prlink.h"
>+@@ -15,9 +15,13 @@
>+ #include <windows.h>
>+ #endif
>  
> +#ifdef MOZ_SYSTEM_SOUNDTOUCH
> +#include "nsXPCOMPrivate.h" // for XUL_DLL
>@@ -200,7 +200,7 @@ index 078f6ea5ef60..c600db067539 100644
>  
>  namespace mozilla {
>  
>-@@ -54,6 +58,12 @@ FFVPXRuntimeLinker::Init()
>+@@ -64,6 +68,12 @@ FFVPXRuntimeLinker::Init()
>  
>    sLinkStatus = LinkStatus_FAILED;
>  
>@@ -212,13 +212,13 @@ index 078f6ea5ef60..c600db067539 100644
> +#else
>    // We retrieve the path of the lgpllibs library as this is where mozavcodec
>    // and mozavutil libs are located.
>-   char* lgpllibsname = PR_GetLibraryName(nullptr, "lgpllibs");
>-@@ -64,6 +74,7 @@ FFVPXRuntimeLinker::Init()
>-     PR_GetLibraryFilePathname(lgpllibsname,
>-                               (PRFuncPtr)&soundtouch::SoundTouch::getVersionId);
>-   PR_FreeLibraryName(lgpllibsname);
>+   PathString lgpllibsname = GetLibraryName(nullptr, "lgpllibs");
>+@@ -73,6 +83,7 @@ FFVPXRuntimeLinker::Init()
>+   PathString path =
>+     GetLibraryFilePathname(lgpllibsname.get(),
>+                            (PRFuncPtr)&soundtouch::SoundTouch::getVersionId);
> +#endif
>-   if (!path) {
>+   if (path.IsEmpty()) {
>      return false;
>    }
> diff --git media/libogg/README_MOZILLA media/libogg/README_MOZILLA

Actions: View | Diff

Attachments on bug 226476: 191341 | 191460 | 191546 | 191556 | 191654 | 191746 | 191780 | 191860 | 191963 | 192155 | 192238 | 192374 | 192488 | 192576 | 192684