From 32483d9217aa0a08f9759ff55e281ad0c683480d Mon Sep 17 00:00:00 2001
From: Christoph Moench-Tegeder <cmt@FreeBSD.org>
Date: Wed, 22 Jun 2022 16:27:56 +0200
Subject: www/firefox: update to 102.0 (rc1)

Release Notes (soon):
  https://www.mozilla.org/en-US/firefox/102.0/releasenotes/

(cherry picked from commit 1bf197ea1f66b2c08685cdad35c88d74fc6b8035)
---
 www/firefox/Makefile                        |    4 +-
 www/firefox/distinfo                        |    6 +-
 www/firefox/files/patch-libwebrtc-generated | 5263 ++++++++++++++-------------
 3 files changed, 2652 insertions(+), 2621 deletions(-)

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index bdc49a8be857..52dbfc84e505 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,7 +1,7 @@
 # Created by: Alan Eldridge <alane@FreeBSD.org>
 
 PORTNAME=	firefox
-DISTVERSION=	101.0.1
+DISTVERSION=	102.0
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
@@ -12,7 +12,7 @@ MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
-		nss>=3.78:security/nss \
+		nss>=3.79:security/nss \
 		icu>=70.1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=4.1.0:print/harfbuzz \
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 86b3bc3cc0bc..356c8fb6fd5e 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1654723818
-SHA256 (firefox-101.0.1.source.tar.xz) = b4c76e8bdf81f473f3e56b2f69dbe5119bba5cab38e36ab0f3f38cf0cdc4a9c2
-SIZE (firefox-101.0.1.source.tar.xz) = 486021240
+TIMESTAMP = 1655753672
+SHA256 (firefox-102.0.source.tar.xz) = c124fa57410fde536797509c2a0907ef5031cc18a63cd9030b5ec98c1063327a
+SIZE (firefox-102.0.source.tar.xz) = 479910784
diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated
index b51a927bddb0..c1052ad4cca1 100644
--- a/www/firefox/files/patch-libwebrtc-generated
+++ b/www/firefox/files/patch-libwebrtc-generated
@@ -2,7 +2,7 @@ diff --git third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.b
 index 3dffbc4abb..aac5d092ef 100644
 --- third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
 +++ third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -20,7 +20,7 @@ index 3dffbc4abb..aac5d092ef 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -31,7 +31,7 @@ index 3dffbc4abb..aac5d092ef 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -42,19 +42,19 @@ index 3dffbc4abb..aac5d092ef 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/array_view_gn/moz.build third_party/libwebrtc/api/array_view_gn/moz.build
 index aca9f59966..1ea31b6a5e 100644
 --- third_party/libwebrtc/api/array_view_gn/moz.build
@@ -103,7 +103,7 @@ diff --git third_party/libwebrtc/api/audio/aec3_config_gn/moz.build third_party/
 index 861233bfeb..c2f87155bb 100644
 --- third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
 +++ third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -121,7 +121,7 @@ index 861233bfeb..c2f87155bb 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -132,7 +132,7 @@ index 861233bfeb..c2f87155bb 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -143,24 +143,24 @@ index 861233bfeb..c2f87155bb 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
 index 2421e514b6..6a6fc577a5 100644
 --- third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
 +++ third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -178,7 +178,7 @@ index 2421e514b6..6a6fc577a5 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -161,6 +172,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +172,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -189,7 +189,7 @@ index 2421e514b6..6a6fc577a5 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -177,6 +192,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -177,6 +192,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -200,24 +200,24 @@ index 2421e514b6..6a6fc577a5 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -199,6 +218,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -201,6 +220,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
 index 48abf7cd40..26317d4cf5 100644
 --- third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -235,7 +235,7 @@ index 48abf7cd40..26317d4cf5 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -154,6 +165,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -246,7 +246,7 @@ index 48abf7cd40..26317d4cf5 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -170,6 +185,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -257,19 +257,19 @@ index 48abf7cd40..26317d4cf5 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -192,6 +211,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
 index 41222e1e06..5a75494c05 100644
 --- third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
@@ -362,7 +362,7 @@ diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.b
 index 8499f556e3..92d90abb2d 100644
 --- third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -380,7 +380,7 @@ index 8499f556e3..92d90abb2d 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -391,7 +391,7 @@ index 8499f556e3..92d90abb2d 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -402,24 +402,24 @@ index 8499f556e3..92d90abb2d 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
 index a5f3673082..58e96dbb98 100644
 --- third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -437,7 +437,7 @@ index a5f3673082..58e96dbb98 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -448,7 +448,7 @@ index a5f3673082..58e96dbb98 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -459,24 +459,24 @@ index a5f3673082..58e96dbb98 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
 index f7bf17624e..1f8a4a7497 100644
 --- third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
-@@ -70,6 +70,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -70,6 +70,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -494,7 +494,7 @@ index f7bf17624e..1f8a4a7497 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -156,6 +167,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -156,6 +167,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -505,7 +505,7 @@ index f7bf17624e..1f8a4a7497 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -172,6 +187,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -172,6 +187,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -516,24 +516,24 @@ index f7bf17624e..1f8a4a7497 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -194,6 +213,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -196,6 +215,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
 index b52257b6b6..402d787b35 100644
 --- third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
-@@ -71,6 +71,19 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -71,6 +71,19 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -553,7 +553,7 @@ index b52257b6b6..402d787b35 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -173,6 +186,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -173,6 +186,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -564,7 +564,7 @@ index b52257b6b6..402d787b35 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -189,6 +206,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -189,6 +206,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -575,24 +575,24 @@ index b52257b6b6..402d787b35 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -224,6 +245,12 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
+@@ -227,6 +248,12 @@
+ 
      DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
      DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
- 
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
 +    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
 diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
 index d84e1656f6..afddfe8bac 100644
 --- third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
-@@ -71,6 +71,19 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -71,6 +71,19 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -612,7 +612,7 @@ index d84e1656f6..afddfe8bac 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -173,6 +186,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -173,6 +186,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -623,7 +623,7 @@ index d84e1656f6..afddfe8bac 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -189,6 +206,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -189,6 +206,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -634,24 +634,24 @@ index d84e1656f6..afddfe8bac 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -224,6 +245,12 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
+@@ -227,6 +248,12 @@
+ 
      DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
      DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
- 
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
 +    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
 diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
 index e39db35128..ec6254de74 100644
 --- third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -669,7 +669,7 @@ index e39db35128..ec6254de74 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -680,7 +680,7 @@ index e39db35128..ec6254de74 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -691,24 +691,24 @@ index e39db35128..ec6254de74 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
 index 6a431c8970..413d83e455 100644
 --- third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -726,7 +726,7 @@ index 6a431c8970..413d83e455 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -737,7 +737,7 @@ index 6a431c8970..413d83e455 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -748,24 +748,24 @@ index 6a431c8970..413d83e455 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
 index 57f9cbdb1a..f1b7612533 100644
 --- third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -783,7 +783,7 @@ index 57f9cbdb1a..f1b7612533 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -794,7 +794,7 @@ index 57f9cbdb1a..f1b7612533 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -805,24 +805,24 @@ index 57f9cbdb1a..f1b7612533 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
 index 6b2c8222cf..17d26b56bb 100644
 --- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
-@@ -59,6 +59,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -840,7 +840,7 @@ index 6b2c8222cf..17d26b56bb 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -137,6 +148,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -851,7 +851,7 @@ index 6b2c8222cf..17d26b56bb 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -153,6 +168,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -862,11 +862,24 @@ index 6b2c8222cf..17d26b56bb 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
+@@ -193,6 +212,12 @@
+ 
+     OS_LIBS += [
+         "android_support"
++    ]
++
++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
++
++    CXXFLAGS += [
++        "-msse2"
+     ]
+ 
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
 index bc3dac1e0e..e6d120ffff 100644
 --- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -884,7 +897,7 @@ index bc3dac1e0e..e6d120ffff 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -895,7 +908,7 @@ index bc3dac1e0e..e6d120ffff 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -906,24 +919,24 @@ index bc3dac1e0e..e6d120ffff 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
 index ca0df168ef..db603b008d 100644
 --- third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -941,7 +954,7 @@ index ca0df168ef..db603b008d 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -160,6 +171,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -160,6 +171,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -952,7 +965,7 @@ index ca0df168ef..db603b008d 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -176,6 +191,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -176,6 +191,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -963,24 +976,24 @@ index ca0df168ef..db603b008d 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -198,6 +217,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -200,6 +219,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
 index 4b3a5922de..9410478923 100644
 --- third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
-@@ -59,6 +59,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -998,7 +1011,7 @@ index 4b3a5922de..9410478923 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -137,6 +148,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -160,6 +171,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -1009,7 +1022,7 @@ index 4b3a5922de..9410478923 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -153,6 +168,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -176,6 +191,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -1020,11 +1033,24 @@ index 4b3a5922de..9410478923 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
+@@ -200,6 +219,12 @@
+ 
+     OS_LIBS += [
+         "android_support"
++    ]
++
++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
++
++    CXXFLAGS += [
++        "-msse2"
+     ]
+ 
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
 index 0fd8a2cd93..3595936b6e 100644
 --- third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -1042,7 +1068,7 @@ index 0fd8a2cd93..3595936b6e 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -160,6 +171,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -160,6 +171,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -1053,7 +1079,7 @@ index 0fd8a2cd93..3595936b6e 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -176,6 +191,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -176,6 +191,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -1064,24 +1090,24 @@ index 0fd8a2cd93..3595936b6e 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -198,6 +217,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -200,6 +219,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn/moz.build third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn/moz.build
 index ea25619a8f..a5418dc87c 100644
 --- third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -1099,7 +1125,7 @@ index ea25619a8f..a5418dc87c 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -146,6 +157,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -146,6 +157,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -1110,7 +1136,7 @@ index ea25619a8f..a5418dc87c 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -162,6 +177,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +177,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -1121,19 +1147,19 @@ index ea25619a8f..a5418dc87c 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -184,6 +203,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -186,6 +205,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn/moz.build third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn/moz.build
 index 63a9de405e..0e8086206d 100644
 --- third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn/moz.build
@@ -1184,7 +1210,7 @@ diff --git third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_
 index 80d57e950c..54f305e11b 100644
 --- third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -1202,7 +1228,7 @@ index 80d57e950c..54f305e11b 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -146,6 +157,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -146,6 +157,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -1213,7 +1239,7 @@ index 80d57e950c..54f305e11b 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -162,6 +177,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +177,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -1224,19 +1250,19 @@ index 80d57e950c..54f305e11b 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -184,6 +203,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -186,6 +205,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_gn/moz.build third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_gn/moz.build
 index ad8509420e..185c938438 100644
 --- third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_gn/moz.build
@@ -1287,7 +1313,7 @@ diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_g
 index 1aac13195a..a7d5573ec5 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -1305,7 +1331,7 @@ index 1aac13195a..a7d5573ec5 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -154,6 +165,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -154,6 +165,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -1316,7 +1342,7 @@ index 1aac13195a..a7d5573ec5 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -170,6 +185,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -170,6 +185,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -1327,19 +1353,19 @@ index 1aac13195a..a7d5573ec5 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -192,6 +211,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -194,6 +213,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
 index 3c14d0afe9..e3e40b8b5b 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
@@ -1388,7 +1414,7 @@ diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz
 index 18314dfa72..c8c06081f4 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -1406,7 +1432,7 @@ index 18314dfa72..c8c06081f4 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -161,6 +172,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +172,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -1417,7 +1443,7 @@ index 18314dfa72..c8c06081f4 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -177,6 +192,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -177,6 +192,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -1428,24 +1454,24 @@ index 18314dfa72..c8c06081f4 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -199,6 +218,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -201,6 +220,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
 index 58f0062b01..7b9e11054b 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -1463,7 +1489,7 @@ index 58f0062b01..7b9e11054b 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -154,6 +165,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -154,6 +165,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -1474,7 +1500,7 @@ index 58f0062b01..7b9e11054b 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -170,6 +185,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -170,6 +185,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -1485,24 +1511,30 @@ index 58f0062b01..7b9e11054b 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -192,6 +211,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -194,6 +213,18 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
 +    ]
 +
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
++
++    CXXFLAGS += [
++        "-msse2"
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
 index a8f5c61509..5d088626da 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
-@@ -72,6 +72,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -72,6 +72,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -1520,7 +1552,7 @@ index a8f5c61509..5d088626da 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -158,6 +169,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -158,6 +169,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -1531,7 +1563,7 @@ index a8f5c61509..5d088626da 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -174,6 +189,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -174,6 +189,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -1542,24 +1574,24 @@ index a8f5c61509..5d088626da 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -196,6 +215,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -198,6 +217,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
 index 2afcfb0571..e7d4692406 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -1577,7 +1609,7 @@ index 2afcfb0571..e7d4692406 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -161,6 +172,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +172,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -1588,7 +1620,7 @@ index 2afcfb0571..e7d4692406 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -177,6 +192,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -177,6 +192,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -1599,24 +1631,24 @@ index 2afcfb0571..e7d4692406 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -199,6 +218,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -201,6 +220,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/audio_options_api_gn/moz.build third_party/libwebrtc/api/audio_options_api_gn/moz.build
 index a9ca2f37f6..10636508a1 100644
 --- third_party/libwebrtc/api/audio_options_api_gn/moz.build
 +++ third_party/libwebrtc/api/audio_options_api_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -1634,7 +1666,7 @@ index a9ca2f37f6..10636508a1 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -1645,7 +1677,7 @@ index a9ca2f37f6..10636508a1 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -1656,19 +1688,19 @@ index a9ca2f37f6..10636508a1 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/bitrate_allocation_gn/moz.build third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
 index 2cc056678b..d7121e8987 100644
 --- third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
@@ -1893,7 +1925,7 @@ diff --git third_party/libwebrtc/api/crypto/options_gn/moz.build third_party/lib
 index 1849070995..f31d4e2240 100644
 --- third_party/libwebrtc/api/crypto/options_gn/moz.build
 +++ third_party/libwebrtc/api/crypto/options_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -1911,7 +1943,7 @@ index 1849070995..f31d4e2240 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -162,6 +173,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +173,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -1922,7 +1954,7 @@ index 1849070995..f31d4e2240 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -178,6 +193,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -178,6 +193,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -1933,19 +1965,19 @@ index 1849070995..f31d4e2240 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -200,6 +219,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -202,6 +221,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/fec_controller_api_gn/moz.build third_party/libwebrtc/api/fec_controller_api_gn/moz.build
 index 4b623b0034..d882c1ebe0 100644
 --- third_party/libwebrtc/api/fec_controller_api_gn/moz.build
@@ -2126,7 +2158,7 @@ diff --git third_party/libwebrtc/api/media_stream_interface_gn/moz.build third_p
 index 90856a4e62..b709d70d24 100644
 --- third_party/libwebrtc/api/media_stream_interface_gn/moz.build
 +++ third_party/libwebrtc/api/media_stream_interface_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -2144,7 +2176,7 @@ index 90856a4e62..b709d70d24 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -2155,7 +2187,7 @@ index 90856a4e62..b709d70d24 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -2166,24 +2198,24 @@ index 90856a4e62..b709d70d24 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
 index 0b2386cefd..73d24403a1 100644
 --- third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
 +++ third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -2201,7 +2233,7 @@ index 0b2386cefd..73d24403a1 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -160,6 +171,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -160,6 +171,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -2212,7 +2244,7 @@ index 0b2386cefd..73d24403a1 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -176,6 +191,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -176,6 +191,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -2223,24 +2255,24 @@ index 0b2386cefd..73d24403a1 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -198,6 +217,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -200,6 +219,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
 index b1fa978fd0..18e69e0265 100644
 --- third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
 +++ third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -2258,7 +2290,7 @@ index b1fa978fd0..18e69e0265 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -160,6 +171,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -160,6 +171,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -2269,7 +2301,7 @@ index b1fa978fd0..18e69e0265 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -176,6 +191,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -176,6 +191,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -2280,19 +2312,19 @@ index b1fa978fd0..18e69e0265 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -198,6 +217,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -200,6 +219,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
 index a250cf1b72..1bcbb5ffa8 100644
 --- third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
@@ -2341,7 +2373,7 @@ diff --git third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build third_party/l
 index 179458a984..d77bb4cb7a 100644
 --- third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
 +++ third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -2359,7 +2391,7 @@ index 179458a984..d77bb4cb7a 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -2370,7 +2402,7 @@ index 179458a984..d77bb4cb7a 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -2381,19 +2413,19 @@ index 179458a984..d77bb4cb7a 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
 index 1a5b0bf109..fa02a56f8e 100644
 --- third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
@@ -2442,7 +2474,7 @@ diff --git third_party/libwebrtc/api/numerics/numerics_gn/moz.build third_party/
 index fa11b290a9..6152ef8e59 100644
 --- third_party/libwebrtc/api/numerics/numerics_gn/moz.build
 +++ third_party/libwebrtc/api/numerics/numerics_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -2460,7 +2492,7 @@ index fa11b290a9..6152ef8e59 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -2471,7 +2503,7 @@ index fa11b290a9..6152ef8e59 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -2482,19 +2514,19 @@ index fa11b290a9..6152ef8e59 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/priority_gn/moz.build third_party/libwebrtc/api/priority_gn/moz.build
 index dbe91f7048..ac0e0c377e 100644
 --- third_party/libwebrtc/api/priority_gn/moz.build
@@ -2587,7 +2619,7 @@ diff --git third_party/libwebrtc/api/rtc_error_gn/moz.build third_party/libwebrt
 index 01b92cee7a..41bbb8718c 100644
 --- third_party/libwebrtc/api/rtc_error_gn/moz.build
 +++ third_party/libwebrtc/api/rtc_error_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -2605,7 +2637,7 @@ index 01b92cee7a..41bbb8718c 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -2616,7 +2648,7 @@ index 01b92cee7a..41bbb8718c 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -2627,24 +2659,24 @@ index 01b92cee7a..41bbb8718c 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
 index 62dec010ac..db7abcf561 100644
 --- third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
 +++ third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -2662,7 +2694,7 @@ index 62dec010ac..db7abcf561 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -154,6 +165,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -154,6 +165,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -2673,7 +2705,7 @@ index 62dec010ac..db7abcf561 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -170,6 +185,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -170,6 +185,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -2684,24 +2716,24 @@ index 62dec010ac..db7abcf561 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -192,6 +211,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -194,6 +213,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/rtp_headers_gn/moz.build third_party/libwebrtc/api/rtp_headers_gn/moz.build
 index 2a67aeb66e..b65a55e453 100644
 --- third_party/libwebrtc/api/rtp_headers_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_headers_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -2719,7 +2751,7 @@ index 2a67aeb66e..b65a55e453 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -2730,7 +2762,7 @@ index 2a67aeb66e..b65a55e453 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -2741,24 +2773,24 @@ index 2a67aeb66e..b65a55e453 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/rtp_packet_info_gn/moz.build third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
 index 8918746b08..f75e6c9c00 100644
 --- third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -2776,7 +2808,7 @@ index 8918746b08..f75e6c9c00 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -2787,7 +2819,7 @@ index 8918746b08..f75e6c9c00 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -2798,24 +2830,24 @@ index 8918746b08..f75e6c9c00 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/rtp_parameters_gn/moz.build third_party/libwebrtc/api/rtp_parameters_gn/moz.build
 index 23d200f8b0..8c778c8cb2 100644
 --- third_party/libwebrtc/api/rtp_parameters_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_parameters_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -2833,7 +2865,7 @@ index 23d200f8b0..8c778c8cb2 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -150,6 +161,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -150,6 +161,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -2844,7 +2876,7 @@ index 23d200f8b0..8c778c8cb2 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -166,6 +181,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -166,6 +181,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -2855,19 +2887,19 @@ index 23d200f8b0..8c778c8cb2 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -188,6 +207,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -190,6 +209,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
 index 6b31767ec8..49ce8708a6 100644
 --- third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
@@ -3004,7 +3036,7 @@ diff --git third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build third_pa
 index 691d7edc2d..8614057ddc 100644
 --- third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
 +++ third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -3022,7 +3054,7 @@ index 691d7edc2d..8614057ddc 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -3033,7 +3065,7 @@ index 691d7edc2d..8614057ddc 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -3044,24 +3076,24 @@ index 691d7edc2d..8614057ddc 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
 index 3513f9c224..9e1a49e8e4 100644
 --- third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
 +++ third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
-@@ -63,6 +63,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -63,6 +63,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -3079,7 +3111,7 @@ index 3513f9c224..9e1a49e8e4 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -145,6 +156,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -145,6 +156,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -3090,7 +3122,7 @@ index 3513f9c224..9e1a49e8e4 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -161,6 +176,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +176,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -3101,24 +3133,24 @@ index 3513f9c224..9e1a49e8e4 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -183,6 +202,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -185,6 +204,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
 index 04aaa9aa2b..ed67e61812 100644
 --- third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
 +++ third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -3136,7 +3168,7 @@ index 04aaa9aa2b..ed67e61812 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -3147,7 +3179,7 @@ index 04aaa9aa2b..ed67e61812 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -3158,24 +3190,24 @@ index 04aaa9aa2b..ed67e61812 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/transport/goog_cc_gn/moz.build third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
 index 409c7dde4b..a05eff6f59 100644
 --- third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
 +++ third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -3193,7 +3225,7 @@ index 409c7dde4b..a05eff6f59 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -162,6 +173,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +173,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -3204,7 +3236,7 @@ index 409c7dde4b..a05eff6f59 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -178,6 +193,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -178,6 +193,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -3215,24 +3247,24 @@ index 409c7dde4b..a05eff6f59 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -200,6 +219,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -202,6 +221,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/transport/network_control_gn/moz.build third_party/libwebrtc/api/transport/network_control_gn/moz.build
 index 09e38326bd..80fa181ab9 100644
 --- third_party/libwebrtc/api/transport/network_control_gn/moz.build
 +++ third_party/libwebrtc/api/transport/network_control_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -3250,7 +3282,7 @@ index 09e38326bd..80fa181ab9 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -3261,7 +3293,7 @@ index 09e38326bd..80fa181ab9 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -3272,24 +3304,24 @@ index 09e38326bd..80fa181ab9 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
 index 735d60d2d2..e21c0aa575 100644
 --- third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
 +++ third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -3307,7 +3339,7 @@ index 735d60d2d2..e21c0aa575 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -3318,7 +3350,7 @@ index 735d60d2d2..e21c0aa575 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -3329,19 +3361,19 @@ index 735d60d2d2..e21c0aa575 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
 index efeffbc658..29eb538b64 100644
 --- third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
@@ -3434,7 +3466,7 @@ diff --git third_party/libwebrtc/api/transport_api_gn/moz.build third_party/libw
 index 41b32d6762..59e6e8ce4a 100644
 --- third_party/libwebrtc/api/transport_api_gn/moz.build
 +++ third_party/libwebrtc/api/transport_api_gn/moz.build
-@@ -63,6 +63,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -63,6 +63,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -3452,7 +3484,7 @@ index 41b32d6762..59e6e8ce4a 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -145,6 +156,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -145,6 +156,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -3463,7 +3495,7 @@ index 41b32d6762..59e6e8ce4a 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -161,6 +176,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +176,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -3474,24 +3506,24 @@ index 41b32d6762..59e6e8ce4a 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -183,6 +202,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -185,6 +204,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/units/data_rate_gn/moz.build third_party/libwebrtc/api/units/data_rate_gn/moz.build
 index 6708de4bb0..3b2fc8ba9c 100644
 --- third_party/libwebrtc/api/units/data_rate_gn/moz.build
 +++ third_party/libwebrtc/api/units/data_rate_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -3509,7 +3541,7 @@ index 6708de4bb0..3b2fc8ba9c 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -3520,7 +3552,7 @@ index 6708de4bb0..3b2fc8ba9c 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -3531,24 +3563,24 @@ index 6708de4bb0..3b2fc8ba9c 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/units/data_size_gn/moz.build third_party/libwebrtc/api/units/data_size_gn/moz.build
 index 14b9742573..54ecb92e08 100644
 --- third_party/libwebrtc/api/units/data_size_gn/moz.build
 +++ third_party/libwebrtc/api/units/data_size_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -3566,7 +3598,7 @@ index 14b9742573..54ecb92e08 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -3577,7 +3609,7 @@ index 14b9742573..54ecb92e08 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -3588,24 +3620,24 @@ index 14b9742573..54ecb92e08 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/units/frequency_gn/moz.build third_party/libwebrtc/api/units/frequency_gn/moz.build
 index 79fcff48ef..6790d9ceaa 100644
 --- third_party/libwebrtc/api/units/frequency_gn/moz.build
 +++ third_party/libwebrtc/api/units/frequency_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -3623,7 +3655,7 @@ index 79fcff48ef..6790d9ceaa 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -3634,7 +3666,7 @@ index 79fcff48ef..6790d9ceaa 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -3645,24 +3677,24 @@ index 79fcff48ef..6790d9ceaa 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/units/time_delta_gn/moz.build third_party/libwebrtc/api/units/time_delta_gn/moz.build
 index 9cd9ff24f3..c32d6624b5 100644
 --- third_party/libwebrtc/api/units/time_delta_gn/moz.build
 +++ third_party/libwebrtc/api/units/time_delta_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -3680,7 +3712,7 @@ index 9cd9ff24f3..c32d6624b5 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -3691,7 +3723,7 @@ index 9cd9ff24f3..c32d6624b5 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -3702,24 +3734,24 @@ index 9cd9ff24f3..c32d6624b5 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/units/timestamp_gn/moz.build third_party/libwebrtc/api/units/timestamp_gn/moz.build
 index 23aa0ba2c5..72d6220c6b 100644
 --- third_party/libwebrtc/api/units/timestamp_gn/moz.build
 +++ third_party/libwebrtc/api/units/timestamp_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -3737,7 +3769,7 @@ index 23aa0ba2c5..72d6220c6b 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -3748,7 +3780,7 @@ index 23aa0ba2c5..72d6220c6b 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -3759,24 +3791,24 @@ index 23aa0ba2c5..72d6220c6b 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
 index 0ecc793d69..ea20a3d5b5 100644
 --- third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
 +++ third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -3794,7 +3826,7 @@ index 0ecc793d69..ea20a3d5b5 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -162,6 +173,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +173,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -3805,7 +3837,7 @@ index 0ecc793d69..ea20a3d5b5 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -178,6 +193,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -178,6 +193,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -3816,24 +3848,24 @@ index 0ecc793d69..ea20a3d5b5 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -200,6 +219,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -202,6 +221,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/video/encoded_frame_gn/moz.build third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
 index 456c8a541d..3b556fdd3c 100644
 --- third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
 +++ third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -3851,7 +3883,7 @@ index 456c8a541d..3b556fdd3c 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -162,6 +173,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +173,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -3862,7 +3894,7 @@ index 456c8a541d..3b556fdd3c 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -178,6 +193,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -178,6 +193,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -3873,24 +3905,24 @@ index 456c8a541d..3b556fdd3c 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -200,6 +219,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -202,6 +221,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/video/encoded_image_gn/moz.build third_party/libwebrtc/api/video/encoded_image_gn/moz.build
 index d109bfa1a0..225b559521 100644
 --- third_party/libwebrtc/api/video/encoded_image_gn/moz.build
 +++ third_party/libwebrtc/api/video/encoded_image_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -3908,7 +3940,7 @@ index d109bfa1a0..225b559521 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -3919,7 +3951,7 @@ index d109bfa1a0..225b559521 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -3930,19 +3962,19 @@ index d109bfa1a0..225b559521 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
 index df2bcac4b7..ad955dc4a0 100644
 --- third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
@@ -3991,7 +4023,7 @@ diff --git third_party/libwebrtc/api/video/video_adaptation_gn/moz.build third_p
 index 539cc93e02..3f6fd22ca3 100644
 --- third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -4009,7 +4041,7 @@ index 539cc93e02..3f6fd22ca3 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -4020,7 +4052,7 @@ index 539cc93e02..3f6fd22ca3 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -4031,24 +4063,24 @@ index 539cc93e02..3f6fd22ca3 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
 index 427be85229..39df8789f7 100644
 --- third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -4066,7 +4098,7 @@ index 427be85229..39df8789f7 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -4077,7 +4109,7 @@ index 427be85229..39df8789f7 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -4088,19 +4120,19 @@ index 427be85229..39df8789f7 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
 index 07db1b3b38..27fad85dc4 100644
 --- third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
@@ -4149,7 +4181,7 @@ diff --git third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
 index 8726c6c5a5..891f5b2ac1 100644
 --- third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -4167,7 +4199,7 @@ index 8726c6c5a5..891f5b2ac1 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -4178,7 +4210,7 @@ index 8726c6c5a5..891f5b2ac1 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -4189,19 +4221,19 @@ index 8726c6c5a5..891f5b2ac1 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
 index 9f6daffa4a..39371a1714 100644
 --- third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
@@ -4250,7 +4282,7 @@ diff --git third_party/libwebrtc/api/video/video_frame_gn/moz.build third_party/
 index cec245170a..646e570081 100644
 --- third_party/libwebrtc/api/video/video_frame_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_frame_gn/moz.build
-@@ -69,6 +69,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -69,6 +69,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -4268,7 +4300,7 @@ index cec245170a..646e570081 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -155,6 +166,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -155,6 +166,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -4279,7 +4311,7 @@ index cec245170a..646e570081 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -171,6 +186,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -171,6 +186,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -4290,24 +4322,24 @@ index cec245170a..646e570081 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -193,6 +212,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -195,6 +214,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
 index fa9d71395c..927c06c940 100644
 --- third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
-@@ -70,6 +70,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -70,6 +70,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -4325,7 +4357,7 @@ index fa9d71395c..927c06c940 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -164,6 +175,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -164,6 +175,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -4336,7 +4368,7 @@ index fa9d71395c..927c06c940 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -180,6 +195,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -180,6 +195,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -4347,24 +4379,24 @@ index fa9d71395c..927c06c940 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -202,6 +221,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -204,6 +223,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/video/video_frame_i420_gn/moz.build third_party/libwebrtc/api/video/video_frame_i420_gn/moz.build
 index 3d4c1bd899..2f0e6fdd07 100644
 --- third_party/libwebrtc/api/video/video_frame_i420_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_frame_i420_gn/moz.build
-@@ -70,6 +70,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -70,6 +70,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -4382,7 +4414,7 @@ index 3d4c1bd899..2f0e6fdd07 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -164,6 +175,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -164,6 +175,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -4393,7 +4425,7 @@ index 3d4c1bd899..2f0e6fdd07 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -180,6 +195,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -180,6 +195,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -4404,24 +4436,24 @@ index 3d4c1bd899..2f0e6fdd07 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -202,6 +221,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -204,6 +223,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
 index c817dc4982..0283c8356c 100644
 --- third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -4439,7 +4471,7 @@ index c817dc4982..0283c8356c 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -4450,7 +4482,7 @@ index c817dc4982..0283c8356c 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -4461,24 +4493,24 @@ index c817dc4982..0283c8356c 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/video/video_frame_nv12_gn/moz.build third_party/libwebrtc/api/video/video_frame_nv12_gn/moz.build
 index 63ee6f9099..2c64a6dc79 100644
 --- third_party/libwebrtc/api/video/video_frame_nv12_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_frame_nv12_gn/moz.build
-@@ -70,6 +70,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -70,6 +70,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -4496,7 +4528,7 @@ index 63ee6f9099..2c64a6dc79 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -164,6 +175,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -164,6 +175,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -4507,7 +4539,7 @@ index 63ee6f9099..2c64a6dc79 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -180,6 +195,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -180,6 +195,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -4518,19 +4550,19 @@ index 63ee6f9099..2c64a6dc79 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -202,6 +221,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -204,6 +223,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/video/video_frame_type_gn/moz.build third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
 index 57cfaf7c23..07f1dd75ba 100644
 --- third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
@@ -4579,7 +4611,7 @@ diff --git third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build third_
 index 54cdbd8c57..1ec0d71ab4 100644
 --- third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
-@@ -70,6 +70,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -70,6 +70,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -4597,7 +4629,7 @@ index 54cdbd8c57..1ec0d71ab4 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -156,6 +167,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -156,6 +167,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -4608,7 +4640,7 @@ index 54cdbd8c57..1ec0d71ab4 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -172,6 +187,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -172,6 +187,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -4619,24 +4651,24 @@ index 54cdbd8c57..1ec0d71ab4 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -194,6 +213,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -196,6 +215,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/video/video_stream_encoder_create_gn/moz.build third_party/libwebrtc/api/video/video_stream_encoder_create_gn/moz.build
 index 57a39cfe40..1d7a2ba9b8 100644
 --- third_party/libwebrtc/api/video/video_stream_encoder_create_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_stream_encoder_create_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -4654,7 +4686,7 @@ index 57a39cfe40..1d7a2ba9b8 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -162,6 +173,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +173,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -4665,7 +4697,7 @@ index 57a39cfe40..1d7a2ba9b8 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -178,6 +193,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -178,6 +193,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -4676,19 +4708,19 @@ index 57a39cfe40..1d7a2ba9b8 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -200,6 +219,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -202,6 +221,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
 index e5e9a7c055..057b4db9ea 100644
 --- third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
@@ -4781,7 +4813,7 @@ diff --git third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_
 index 1d21c1fa81..8c122cbd13 100644
 --- third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -4799,7 +4831,7 @@ index 1d21c1fa81..8c122cbd13 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -162,6 +173,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +173,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -4810,7 +4842,7 @@ index 1d21c1fa81..8c122cbd13 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -178,6 +193,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -178,6 +193,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -4821,24 +4853,24 @@ index 1d21c1fa81..8c122cbd13 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -200,6 +219,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -202,6 +221,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/video_codecs/builtin_video_encoder_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/builtin_video_encoder_factory_gn/moz.build
 index bd29841460..ea3e4aab9b 100644
 --- third_party/libwebrtc/api/video_codecs/builtin_video_encoder_factory_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/builtin_video_encoder_factory_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -4856,7 +4888,7 @@ index bd29841460..ea3e4aab9b 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -162,6 +173,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +173,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -4867,7 +4899,7 @@ index bd29841460..ea3e4aab9b 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -178,6 +193,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -178,6 +193,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -4878,24 +4910,24 @@ index bd29841460..ea3e4aab9b 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -200,6 +219,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -202,6 +221,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
 index 90afc61ce7..2dad21ab8e 100644
 --- third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
-@@ -69,6 +69,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -69,6 +69,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -4913,7 +4945,7 @@ index 90afc61ce7..2dad21ab8e 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -163,6 +174,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -163,6 +174,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -4924,7 +4956,7 @@ index 90afc61ce7..2dad21ab8e 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -179,6 +194,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -179,6 +194,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -4935,24 +4967,24 @@ index 90afc61ce7..2dad21ab8e 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -201,6 +220,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -203,6 +222,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
 index acf0202689..c80bfb5b66 100644
 --- third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
-@@ -75,6 +75,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -75,6 +75,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -4970,7 +5002,7 @@ index acf0202689..c80bfb5b66 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -161,6 +172,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +172,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -4981,7 +5013,7 @@ index acf0202689..c80bfb5b66 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -177,6 +192,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -177,6 +192,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -4992,24 +5024,24 @@ index acf0202689..c80bfb5b66 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -199,6 +218,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -201,6 +220,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
 index e0bcb09d59..4bf73c444c 100644
 --- third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -5027,7 +5059,7 @@ index e0bcb09d59..4bf73c444c 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -162,6 +173,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +173,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -5038,7 +5070,7 @@ index e0bcb09d59..4bf73c444c 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -178,6 +193,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -178,6 +193,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -5049,24 +5081,24 @@ index e0bcb09d59..4bf73c444c 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -200,6 +219,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -202,6 +221,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/audio/audio_gn/moz.build third_party/libwebrtc/audio/audio_gn/moz.build
 index 48c74e8063..78ccf8d0e2 100644
 --- third_party/libwebrtc/audio/audio_gn/moz.build
 +++ third_party/libwebrtc/audio/audio_gn/moz.build
-@@ -81,6 +81,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -81,6 +81,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -5084,7 +5116,7 @@ index 48c74e8063..78ccf8d0e2 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -175,6 +186,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -175,6 +186,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -5095,7 +5127,7 @@ index 48c74e8063..78ccf8d0e2 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -191,6 +206,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -191,6 +206,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -5106,24 +5138,24 @@ index 48c74e8063..78ccf8d0e2 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -213,6 +232,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -215,6 +234,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
 index f3708d6b8e..a7fa266d64 100644
 --- third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
 +++ third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
-@@ -69,6 +69,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -69,6 +69,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -5141,7 +5173,7 @@ index f3708d6b8e..a7fa266d64 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -162,6 +173,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +173,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -5152,7 +5184,7 @@ index f3708d6b8e..a7fa266d64 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -178,6 +193,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -178,6 +193,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -5163,24 +5195,24 @@ index f3708d6b8e..a7fa266d64 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -200,6 +219,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -202,6 +221,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
 index 0c08bff6a3..2a6e85ac47 100644
 --- third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
 +++ third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
-@@ -77,6 +77,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -77,6 +77,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -5198,7 +5230,7 @@ index 0c08bff6a3..2a6e85ac47 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -171,6 +182,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -171,6 +182,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -5209,7 +5241,7 @@ index 0c08bff6a3..2a6e85ac47 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -187,6 +202,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -187,6 +202,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -5220,19 +5252,19 @@ index 0c08bff6a3..2a6e85ac47 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -209,6 +228,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -211,6 +230,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/call/audio_sender_interface_gn/moz.build third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
 index a746c88078..cb4ace74be 100644
 --- third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
@@ -5281,7 +5313,7 @@ diff --git third_party/libwebrtc/call/bitrate_allocator_gn/moz.build third_party
 index 8d140ba125..5ee40a51d4 100644
 --- third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
 +++ third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -5299,7 +5331,7 @@ index 8d140ba125..5ee40a51d4 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -160,6 +171,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -160,6 +171,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -5310,7 +5342,7 @@ index 8d140ba125..5ee40a51d4 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -176,6 +191,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -176,6 +191,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -5321,24 +5353,24 @@ index 8d140ba125..5ee40a51d4 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -198,6 +217,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -200,6 +219,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/call/bitrate_configurator_gn/moz.build third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
 index 2dba19a53a..290ee2e201 100644
 --- third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
 +++ third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -5356,7 +5388,7 @@ index 2dba19a53a..290ee2e201 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -162,6 +173,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +173,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -5367,7 +5399,7 @@ index 2dba19a53a..290ee2e201 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -178,6 +193,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -178,6 +193,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -5378,24 +5410,24 @@ index 2dba19a53a..290ee2e201 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -200,6 +219,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -202,6 +221,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/call/call_gn/moz.build third_party/libwebrtc/call/call_gn/moz.build
 index 8cb24f9748..7f3d3e0f33 100644
 --- third_party/libwebrtc/call/call_gn/moz.build
 +++ third_party/libwebrtc/call/call_gn/moz.build
-@@ -72,6 +72,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -72,6 +72,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -5413,7 +5445,7 @@ index 8cb24f9748..7f3d3e0f33 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -166,6 +177,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -166,6 +177,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -5424,7 +5456,7 @@ index 8cb24f9748..7f3d3e0f33 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -182,6 +197,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -182,6 +197,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -5435,24 +5467,24 @@ index 8cb24f9748..7f3d3e0f33 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -204,6 +223,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -206,6 +225,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/call/call_interfaces_gn/moz.build third_party/libwebrtc/call/call_interfaces_gn/moz.build
 index 4f07c8b731..8ef60e959c 100644
 --- third_party/libwebrtc/call/call_interfaces_gn/moz.build
 +++ third_party/libwebrtc/call/call_interfaces_gn/moz.build
-@@ -73,6 +73,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -73,6 +73,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -5470,7 +5502,7 @@ index 4f07c8b731..8ef60e959c 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -167,6 +178,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -167,6 +178,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -5481,7 +5513,7 @@ index 4f07c8b731..8ef60e959c 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -183,6 +198,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -183,6 +198,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -5492,24 +5524,24 @@ index 4f07c8b731..8ef60e959c 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -205,6 +224,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -207,6 +226,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/call/fake_network_gn/moz.build third_party/libwebrtc/call/fake_network_gn/moz.build
 index 54b8d2df6b..2d2ebb2e84 100644
 --- third_party/libwebrtc/call/fake_network_gn/moz.build
 +++ third_party/libwebrtc/call/fake_network_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -5527,7 +5559,7 @@ index 54b8d2df6b..2d2ebb2e84 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -162,6 +173,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +173,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -5538,7 +5570,7 @@ index 54b8d2df6b..2d2ebb2e84 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -178,6 +193,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -178,6 +193,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -5549,24 +5581,24 @@ index 54b8d2df6b..2d2ebb2e84 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -200,6 +219,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -202,6 +221,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/call/rtp_interfaces_gn/moz.build third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
 index 040939df59..814d9c1d92 100644
 --- third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
 +++ third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -5584,7 +5616,7 @@ index 040939df59..814d9c1d92 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -162,6 +173,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +173,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -5595,7 +5627,7 @@ index 040939df59..814d9c1d92 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -178,6 +193,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -178,6 +193,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -5606,24 +5638,24 @@ index 040939df59..814d9c1d92 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -200,6 +219,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -202,6 +221,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/call/rtp_receiver_gn/moz.build third_party/libwebrtc/call/rtp_receiver_gn/moz.build
 index 5c1f19a9da..f31fa589f9 100644
 --- third_party/libwebrtc/call/rtp_receiver_gn/moz.build
 +++ third_party/libwebrtc/call/rtp_receiver_gn/moz.build
-@@ -70,6 +70,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -70,6 +70,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -5641,7 +5673,7 @@ index 5c1f19a9da..f31fa589f9 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -164,6 +175,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -164,6 +175,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -5652,7 +5684,7 @@ index 5c1f19a9da..f31fa589f9 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -180,6 +195,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -180,6 +195,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -5663,24 +5695,24 @@ index 5c1f19a9da..f31fa589f9 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -202,6 +221,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -204,6 +223,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/call/rtp_sender_gn/moz.build third_party/libwebrtc/call/rtp_sender_gn/moz.build
 index 1d14b03100..337dcfd1ce 100644
 --- third_party/libwebrtc/call/rtp_sender_gn/moz.build
 +++ third_party/libwebrtc/call/rtp_sender_gn/moz.build
-@@ -70,6 +70,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -70,6 +70,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -5698,7 +5730,7 @@ index 1d14b03100..337dcfd1ce 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -164,6 +175,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -164,6 +175,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -5709,7 +5741,7 @@ index 1d14b03100..337dcfd1ce 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -180,6 +195,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -180,6 +195,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -5720,24 +5752,24 @@ index 1d14b03100..337dcfd1ce 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -202,6 +221,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -204,6 +223,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/call/simulated_network_gn/moz.build third_party/libwebrtc/call/simulated_network_gn/moz.build
 index 62ff82980c..6abb9718b7 100644
 --- third_party/libwebrtc/call/simulated_network_gn/moz.build
 +++ third_party/libwebrtc/call/simulated_network_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -5755,7 +5787,7 @@ index 62ff82980c..6abb9718b7 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -162,6 +173,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +173,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -5766,7 +5798,7 @@ index 62ff82980c..6abb9718b7 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -178,6 +193,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -178,6 +193,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -5777,19 +5809,19 @@ index 62ff82980c..6abb9718b7 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -200,6 +219,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -202,6 +221,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/call/simulated_packet_receiver_gn/moz.build third_party/libwebrtc/call/simulated_packet_receiver_gn/moz.build
 index e51a1dce73..0961e95dbb 100644
 --- third_party/libwebrtc/call/simulated_packet_receiver_gn/moz.build
@@ -5838,7 +5870,7 @@ diff --git third_party/libwebrtc/call/video_stream_api_gn/moz.build third_party/
 index 926361a8fa..bf3117cf96 100644
 --- third_party/libwebrtc/call/video_stream_api_gn/moz.build
 +++ third_party/libwebrtc/call/video_stream_api_gn/moz.build
-@@ -69,6 +69,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -69,6 +69,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -5856,7 +5888,7 @@ index 926361a8fa..bf3117cf96 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -163,6 +174,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -163,6 +174,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -5867,7 +5899,7 @@ index 926361a8fa..bf3117cf96 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -179,6 +194,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -179,6 +194,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -5878,19 +5910,19 @@ index 926361a8fa..bf3117cf96 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -201,6 +220,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -203,6 +222,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
 index 386e90330f..e8a0c2625a 100644
 --- third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
@@ -5996,7 +6028,7 @@ diff --git third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build third_
 index 8e471b3278..cf7c67d7f1 100644
 --- third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
-@@ -110,6 +110,22 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -110,6 +110,22 @@
          "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
      ]
  
@@ -6019,7 +6051,7 @@ index 8e471b3278..cf7c67d7f1 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -218,6 +234,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -218,6 +234,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -6030,7 +6062,7 @@ index 8e471b3278..cf7c67d7f1 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -234,6 +254,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -234,6 +254,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -6041,24 +6073,24 @@ index 8e471b3278..cf7c67d7f1 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -275,6 +299,12 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
+@@ -277,6 +301,12 @@
+     UNIFIED_SOURCES += [
+         "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
          "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
-     ]
- 
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
-+    CFLAGS += [
++    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
 index 5475e35ad6..1aa0a02b27 100644
 --- third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -6076,7 +6108,7 @@ index 5475e35ad6..1aa0a02b27 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -160,6 +171,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -160,6 +171,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -6087,7 +6119,7 @@ index 5475e35ad6..1aa0a02b27 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -176,6 +191,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -176,6 +191,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -6098,24 +6130,24 @@ index 5475e35ad6..1aa0a02b27 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -198,6 +217,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -200,6 +219,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/common_audio/common_audio_gn/moz.build third_party/libwebrtc/common_audio/common_audio_gn/moz.build
 index e499c12bf0..6d5c275806 100644
 --- third_party/libwebrtc/common_audio/common_audio_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_gn/moz.build
-@@ -80,6 +80,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -80,6 +80,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -6133,7 +6165,7 @@ index e499c12bf0..6d5c275806 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -173,6 +184,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -173,6 +184,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -6144,7 +6176,7 @@ index e499c12bf0..6d5c275806 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -189,6 +204,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -189,6 +204,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -6155,19 +6187,19 @@ index e499c12bf0..6d5c275806 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -211,6 +230,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -213,6 +232,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build
 index 36ffd6add1..a16a1a6b1b 100644
 --- third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build
@@ -6326,7 +6358,7 @@ diff --git third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build th
 index e93b927f63..c3847e1200 100644
 --- third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
 +++ third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -6344,7 +6376,7 @@ index e93b927f63..c3847e1200 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -161,6 +172,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +172,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -6355,7 +6387,7 @@ index e93b927f63..c3847e1200 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -177,6 +192,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -177,6 +192,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -6366,19 +6398,19 @@ index e93b927f63..c3847e1200 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -199,6 +218,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -201,6 +220,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/common_audio/fir_filter_gn/moz.build third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
 index 1bb7ad1e4b..ea708477d7 100644
 --- third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
@@ -6471,7 +6503,7 @@ diff --git third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/
 index 49d8183bb8..de0e1795f9 100644
 --- third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build
 +++ third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -6489,7 +6521,7 @@ index 49d8183bb8..de0e1795f9 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -182,6 +193,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -182,6 +193,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -6500,7 +6532,7 @@ index 49d8183bb8..de0e1795f9 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -198,6 +213,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -198,6 +213,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -6511,35 +6543,35 @@ index 49d8183bb8..de0e1795f9 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -241,6 +260,23 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Darwin":
-         "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc"
+@@ -236,6 +255,23 @@
      ]
  
-+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
+ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Darwin":
 +
 +    CXXFLAGS += [
-+        "-msse2",
 +        "-msse2"
 +    ]
 +
-+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "FreeBSD":
++    UNIFIED_SOURCES += [
++        "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc"
++    ]
++
++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
++        "-msse2",
 +        "-msse2"
 +    ]
 +
-+    UNIFIED_SOURCES += [
-+        "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "FreeBSD":
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+     CXXFLAGS += [
+         "-msse2"
 diff --git third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build
 index b3213bf070..51951092da 100644
 --- third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build
 +++ third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build
-@@ -63,6 +63,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -63,6 +63,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -6557,7 +6589,7 @@ index b3213bf070..51951092da 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -145,6 +156,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -145,6 +156,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -6568,7 +6600,7 @@ index b3213bf070..51951092da 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -161,6 +176,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +176,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -6579,24 +6611,24 @@ index b3213bf070..51951092da 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -183,6 +202,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -185,6 +204,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
 index 6d03704624..d96b6f3a71 100644
 --- third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
 +++ third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
-@@ -63,6 +63,21 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -63,6 +63,21 @@
          "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
      ]
  
@@ -6618,7 +6650,7 @@ index 6d03704624..d96b6f3a71 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -157,6 +172,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -157,6 +172,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -6629,7 +6661,7 @@ index 6d03704624..d96b6f3a71 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -173,6 +192,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -173,6 +192,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -6640,24 +6672,24 @@ index 6d03704624..d96b6f3a71 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -211,6 +234,12 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
-         "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
-     ]
+@@ -213,6 +236,12 @@
  
+     UNIFIED_SOURCES += [
+         "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/common_video/common_video_gn/moz.build third_party/libwebrtc/common_video/common_video_gn/moz.build
 index 5d6a4adcb3..26138f5af1 100644
 --- third_party/libwebrtc/common_video/common_video_gn/moz.build
 +++ third_party/libwebrtc/common_video/common_video_gn/moz.build
-@@ -81,6 +81,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -81,6 +81,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -6675,7 +6707,7 @@ index 5d6a4adcb3..26138f5af1 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -175,6 +186,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -175,6 +186,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -6686,7 +6718,7 @@ index 5d6a4adcb3..26138f5af1 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -191,6 +206,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -191,6 +206,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -6697,19 +6729,19 @@ index 5d6a4adcb3..26138f5af1 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -213,6 +232,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -215,6 +234,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/common_video/frame_counts_gn/moz.build third_party/libwebrtc/common_video/frame_counts_gn/moz.build
 index c33906773b..eecfd4dd84 100644
 --- third_party/libwebrtc/common_video/frame_counts_gn/moz.build
@@ -6758,7 +6790,7 @@ diff --git third_party/libwebrtc/common_video/generic_frame_descriptor/generic_f
 index 04b49591a7..81d951ca17 100644
 --- third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build
 +++ third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -6776,7 +6808,7 @@ index 04b49591a7..81d951ca17 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -6787,7 +6819,7 @@ index 04b49591a7..81d951ca17 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -6798,24 +6830,24 @@ index 04b49591a7..81d951ca17 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
-+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
+     OS_LIBS += [
+         "android_support"
++    ]
++
++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
 index 7cd0d06686..63a1163ec2 100644
 --- third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
-@@ -70,6 +70,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -70,6 +70,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -6833,7 +6865,7 @@ index 7cd0d06686..63a1163ec2 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -156,6 +167,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -156,6 +167,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -6844,7 +6876,7 @@ index 7cd0d06686..63a1163ec2 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -172,6 +187,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -172,6 +187,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -6855,24 +6887,24 @@ index 7cd0d06686..63a1163ec2 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -194,6 +213,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -196,6 +215,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
 index 7902cecfcf..678eb54e71 100644
 --- third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
-@@ -73,6 +73,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -73,6 +73,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -6890,7 +6922,7 @@ index 7902cecfcf..678eb54e71 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -167,6 +178,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -167,6 +178,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -6901,7 +6933,7 @@ index 7902cecfcf..678eb54e71 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -183,6 +198,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -183,6 +198,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -6912,24 +6944,24 @@ index 7902cecfcf..678eb54e71 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -205,6 +224,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -207,6 +226,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
 index 5ce1736a8a..2c2277cfda 100644
 --- third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -6947,7 +6979,7 @@ index 5ce1736a8a..2c2277cfda 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -6958,7 +6990,7 @@ index 5ce1736a8a..2c2277cfda 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -6969,24 +7001,24 @@ index 5ce1736a8a..2c2277cfda 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
 index 87fa2c1dac..59b5df3381 100644
 --- third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
-@@ -71,6 +71,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -71,6 +71,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -7004,7 +7036,7 @@ index 87fa2c1dac..59b5df3381 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -165,6 +176,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +176,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -7015,7 +7047,7 @@ index 87fa2c1dac..59b5df3381 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -181,6 +196,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -181,6 +196,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -7026,24 +7058,24 @@ index 87fa2c1dac..59b5df3381 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -203,6 +222,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -205,6 +224,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/logging/rtc_event_video_gn/moz.build third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
 index 35bbf759ab..740650442b 100644
 --- third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -7061,7 +7093,7 @@ index 35bbf759ab..740650442b 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -154,6 +165,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -154,6 +165,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -7072,7 +7104,7 @@ index 35bbf759ab..740650442b 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -170,6 +185,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -170,6 +185,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -7083,24 +7115,24 @@ index 35bbf759ab..740650442b 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -192,6 +211,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -194,6 +213,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
 index 6b35e5a077..b1fe6b3bb3 100644
 --- third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -7118,7 +7150,7 @@ index 6b35e5a077..b1fe6b3bb3 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -7129,7 +7161,7 @@ index 6b35e5a077..b1fe6b3bb3 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -7140,24 +7172,24 @@ index 6b35e5a077..b1fe6b3bb3 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/media/rtc_constants_gn/moz.build third_party/libwebrtc/media/rtc_constants_gn/moz.build
 index 78cddb03a1..1e857b78e7 100644
 --- third_party/libwebrtc/media/rtc_constants_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_constants_gn/moz.build
-@@ -63,6 +63,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -63,6 +63,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -7175,7 +7207,7 @@ index 78cddb03a1..1e857b78e7 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -145,6 +156,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -145,6 +156,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -7186,7 +7218,7 @@ index 78cddb03a1..1e857b78e7 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -161,6 +176,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +176,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -7197,24 +7229,24 @@ index 78cddb03a1..1e857b78e7 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -183,6 +202,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -185,6 +204,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build
 index 4f84ca1381..cdc80664ad 100644
 --- third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -7232,7 +7264,7 @@ index 4f84ca1381..cdc80664ad 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -162,6 +173,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +173,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -7243,7 +7275,7 @@ index 4f84ca1381..cdc80664ad 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -178,6 +193,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -178,6 +193,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -7254,24 +7286,24 @@ index 4f84ca1381..cdc80664ad 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -200,6 +219,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -202,6 +221,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/media/rtc_h264_profile_id_gn/moz.build third_party/libwebrtc/media/rtc_h264_profile_id_gn/moz.build
 index 46b6a25fea..b02ad9dae0 100644
 --- third_party/libwebrtc/media/rtc_h264_profile_id_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_h264_profile_id_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -7289,7 +7321,7 @@ index 46b6a25fea..b02ad9dae0 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -162,6 +173,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +173,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -7300,7 +7332,7 @@ index 46b6a25fea..b02ad9dae0 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -178,6 +193,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -178,6 +193,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -7311,24 +7343,24 @@ index 46b6a25fea..b02ad9dae0 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -200,6 +219,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -202,6 +221,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
 index aff43704f4..3e09a88cb7 100644
 --- third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
-@@ -70,6 +70,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -70,6 +70,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -7346,7 +7378,7 @@ index aff43704f4..3e09a88cb7 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -164,6 +175,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -164,6 +175,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -7357,7 +7389,7 @@ index aff43704f4..3e09a88cb7 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -180,6 +195,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -180,6 +195,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -7368,24 +7400,24 @@ index aff43704f4..3e09a88cb7 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -202,6 +221,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -204,6 +223,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/media/rtc_media_base_gn/moz.build third_party/libwebrtc/media/rtc_media_base_gn/moz.build
 index 7b0ac45394..e1e6b7c15e 100644
 --- third_party/libwebrtc/media/rtc_media_base_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_media_base_gn/moz.build
-@@ -73,6 +73,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -73,6 +73,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -7403,7 +7435,7 @@ index 7b0ac45394..e1e6b7c15e 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -167,6 +178,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -167,6 +178,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -7414,7 +7446,7 @@ index 7b0ac45394..e1e6b7c15e 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -183,6 +198,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -183,6 +198,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -7425,19 +7457,19 @@ index 7b0ac45394..e1e6b7c15e 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -205,6 +224,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -207,6 +226,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/media/rtc_media_config_gn/moz.build third_party/libwebrtc/media/rtc_media_config_gn/moz.build
 index e559dfd675..d24a1900d9 100644
 --- third_party/libwebrtc/media/rtc_media_config_gn/moz.build
@@ -7486,7 +7518,7 @@ diff --git third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.buil
 index 266b11ad8e..d7c74367e9 100644
 --- third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -7504,7 +7536,7 @@ index 266b11ad8e..d7c74367e9 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -162,6 +173,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +173,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -7515,7 +7547,7 @@ index 266b11ad8e..d7c74367e9 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -178,6 +193,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -178,6 +193,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -7526,24 +7558,24 @@ index 266b11ad8e..d7c74367e9 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -200,6 +219,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -202,6 +221,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/media/rtc_vp9_profile_gn/moz.build third_party/libwebrtc/media/rtc_vp9_profile_gn/moz.build
 index 52456dd65b..ce3a4ea0f0 100644
 --- third_party/libwebrtc/media/rtc_vp9_profile_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_vp9_profile_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -7561,7 +7593,7 @@ index 52456dd65b..ce3a4ea0f0 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -7572,7 +7604,7 @@ index 52456dd65b..ce3a4ea0f0 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -7583,24 +7615,24 @@ index 52456dd65b..ce3a4ea0f0 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
 index 1f968a13a1..94ecdd7dfa 100644
 --- third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
-@@ -71,6 +71,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -71,6 +71,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -7618,7 +7650,7 @@ index 1f968a13a1..94ecdd7dfa 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -164,6 +175,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -164,6 +175,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -7629,7 +7661,7 @@ index 1f968a13a1..94ecdd7dfa 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -180,6 +195,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -180,6 +195,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -7640,19 +7672,19 @@ index 1f968a13a1..94ecdd7dfa 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -202,6 +221,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -204,6 +223,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
 index 1c313a5b00..08d3e88c98 100644
 --- third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
@@ -7701,7 +7733,7 @@ diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_g
 index bd7056caf3..a8a0801d58 100644
 --- third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -7719,7 +7751,7 @@ index bd7056caf3..a8a0801d58 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -7730,7 +7762,7 @@ index bd7056caf3..a8a0801d58 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -7741,24 +7773,24 @@ index bd7056caf3..a8a0801d58 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
 index 6fa0115864..a0ffc9ad0f 100644
 --- third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -7776,7 +7808,7 @@ index 6fa0115864..a0ffc9ad0f 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -160,6 +171,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -160,6 +171,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -7787,7 +7819,7 @@ index 6fa0115864..a0ffc9ad0f 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -176,6 +191,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -176,6 +191,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -7798,24 +7830,24 @@ index 6fa0115864..a0ffc9ad0f 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -198,6 +217,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -200,6 +219,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
 index b537062aef..560f57dc55 100644
 --- third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
-@@ -63,6 +63,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -63,6 +63,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -7833,7 +7865,7 @@ index b537062aef..560f57dc55 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -145,6 +156,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -145,6 +156,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -7844,7 +7876,7 @@ index b537062aef..560f57dc55 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -161,6 +176,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +176,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -7855,24 +7887,24 @@ index b537062aef..560f57dc55 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -183,6 +202,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -185,6 +204,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
 index b38993845c..4660cc9b91 100644
 --- third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
-@@ -77,6 +77,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -77,6 +77,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -7890,7 +7922,7 @@ index b38993845c..4660cc9b91 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -170,6 +181,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -170,6 +181,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -7901,7 +7933,7 @@ index b38993845c..4660cc9b91 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -186,6 +201,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -186,6 +201,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -7912,24 +7944,24 @@ index b38993845c..4660cc9b91 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -208,6 +227,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -210,6 +229,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build
 index df061c6618..c2bbb84fd5 100644
 --- third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -7947,7 +7979,7 @@ index df061c6618..c2bbb84fd5 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -160,6 +171,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -160,6 +171,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -7958,7 +7990,7 @@ index df061c6618..c2bbb84fd5 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -176,6 +191,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -176,6 +191,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -7969,24 +8001,24 @@ index df061c6618..c2bbb84fd5 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -198,6 +217,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -200,6 +219,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
 index e0f07f2351..d333d25384 100644
 --- third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
-@@ -63,6 +63,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -63,6 +63,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -8004,7 +8036,7 @@ index e0f07f2351..d333d25384 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -145,6 +156,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -145,6 +156,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -8015,7 +8047,7 @@ index e0f07f2351..d333d25384 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -161,6 +176,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +176,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -8026,24 +8058,24 @@ index e0f07f2351..d333d25384 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -183,6 +202,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -185,6 +204,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
-+    CFLAGS += [
++    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
 index 3716ec4cbe..850c1de44e 100644
 --- third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -8061,7 +8093,7 @@ index 3716ec4cbe..850c1de44e 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -154,6 +165,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -154,6 +165,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -8072,7 +8104,7 @@ index 3716ec4cbe..850c1de44e 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -170,6 +185,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -170,6 +185,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -8083,24 +8115,24 @@ index 3716ec4cbe..850c1de44e 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -192,6 +211,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -194,6 +213,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
 index 8910ce7cf4..0a1a559212 100644
 --- third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
-@@ -63,6 +63,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -63,6 +63,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -8118,7 +8150,7 @@ index 8910ce7cf4..0a1a559212 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -145,6 +156,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -145,6 +156,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -8129,7 +8161,7 @@ index 8910ce7cf4..0a1a559212 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -161,6 +176,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +176,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -8140,24 +8172,24 @@ index 8910ce7cf4..0a1a559212 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -183,6 +202,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -185,6 +204,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
-+    CFLAGS += [
++    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
 index 71d1053761..81dae2b987 100644
 --- third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -8175,7 +8207,7 @@ index 71d1053761..81dae2b987 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -154,6 +165,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -154,6 +165,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -8186,7 +8218,7 @@ index 71d1053761..81dae2b987 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -170,6 +185,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -170,6 +185,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -8197,24 +8229,24 @@ index 71d1053761..81dae2b987 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -192,6 +211,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -194,6 +213,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build
 index 165ab4b8ac..1588baf881 100644
 --- third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build
-@@ -135,6 +135,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -135,6 +135,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -8232,7 +8264,7 @@ index 165ab4b8ac..1588baf881 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -228,6 +239,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -228,6 +239,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -8243,7 +8275,7 @@ index 165ab4b8ac..1588baf881 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -244,6 +259,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -244,6 +259,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -8254,24 +8286,24 @@ index 165ab4b8ac..1588baf881 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -266,6 +285,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -268,6 +287,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
-+    CFLAGS += [
++    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build
 index e46ee8458f..d4a96cbb19 100644
 --- third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -8289,7 +8321,7 @@ index e46ee8458f..d4a96cbb19 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -161,6 +172,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +172,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -8300,7 +8332,7 @@ index e46ee8458f..d4a96cbb19 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -177,6 +192,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -177,6 +192,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -8311,19 +8343,19 @@ index e46ee8458f..d4a96cbb19 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -199,6 +218,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -201,6 +220,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
 index 538b0d271d..cbcab8c2f3 100644
 --- third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
@@ -8372,7 +8404,7 @@ diff --git third_party/libwebrtc/modules/audio_coding/isac_c_gn/moz.build third_
 index 43fb6469dd..b49f126bad 100644
 --- third_party/libwebrtc/modules/audio_coding/isac_c_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/isac_c_gn/moz.build
-@@ -89,6 +89,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -89,6 +89,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -8390,7 +8422,7 @@ index 43fb6469dd..b49f126bad 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -168,6 +179,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -168,6 +179,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -8401,7 +8433,7 @@ index 43fb6469dd..b49f126bad 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -184,6 +199,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -184,6 +199,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -8412,19 +8444,19 @@ index 43fb6469dd..b49f126bad 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -206,6 +225,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -208,6 +227,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
-+    CFLAGS += [
++    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_coding/isac_common_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_common_gn/moz.build
 index b4ed48e62b..9656a8e979 100644
 --- third_party/libwebrtc/modules/audio_coding/isac_common_gn/moz.build
@@ -8473,7 +8505,7 @@ diff --git third_party/libwebrtc/modules/audio_coding/isac_gn/moz.build third_pa
 index 67f836250c..64781830bc 100644
 --- third_party/libwebrtc/modules/audio_coding/isac_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/isac_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -8491,7 +8523,7 @@ index 67f836250c..64781830bc 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -147,6 +158,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -147,6 +158,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -8502,7 +8534,7 @@ index 67f836250c..64781830bc 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -163,6 +178,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -163,6 +178,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -8513,24 +8545,24 @@ index 67f836250c..64781830bc 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -185,6 +204,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -187,6 +206,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
 index b7c99fdd71..0a445df1f7 100644
 --- third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
-@@ -66,6 +66,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -66,6 +66,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -8548,7 +8580,7 @@ index b7c99fdd71..0a445df1f7 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -148,6 +159,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -148,6 +159,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -8559,7 +8591,7 @@ index b7c99fdd71..0a445df1f7 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -164,6 +179,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -164,6 +179,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -8570,24 +8602,24 @@ index b7c99fdd71..0a445df1f7 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -186,6 +205,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -188,6 +207,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
-+    CFLAGS += [
++    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
 index 16e35fafbb..a8ca6dc587 100644
 --- third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -8605,7 +8637,7 @@ index 16e35fafbb..a8ca6dc587 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -8616,7 +8648,7 @@ index 16e35fafbb..a8ca6dc587 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -8627,24 +8659,24 @@ index 16e35fafbb..a8ca6dc587 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
 index fb0747b69c..46a84e8c38 100644
 --- third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
-@@ -99,6 +99,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -99,6 +99,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -8662,7 +8694,7 @@ index fb0747b69c..46a84e8c38 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -192,6 +203,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -192,6 +203,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -8673,7 +8705,7 @@ index fb0747b69c..46a84e8c38 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -208,6 +223,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -208,6 +223,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -8684,24 +8716,24 @@ index fb0747b69c..46a84e8c38 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -230,6 +249,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -232,6 +251,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
 index 24cda76b67..99e02a289f 100644
 --- third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
-@@ -63,6 +63,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -63,6 +63,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -8719,7 +8751,7 @@ index 24cda76b67..99e02a289f 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -145,6 +156,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -145,6 +156,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -8730,7 +8762,7 @@ index 24cda76b67..99e02a289f 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -161,6 +176,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +176,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -8741,24 +8773,24 @@ index 24cda76b67..99e02a289f 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -183,6 +202,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -185,6 +204,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
-+    CFLAGS += [
++    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
 index 621edd1f38..09f6cceb97 100644
 --- third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
-@@ -69,6 +69,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -69,6 +69,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -8776,7 +8808,7 @@ index 621edd1f38..09f6cceb97 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -155,6 +166,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -155,6 +166,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -8787,7 +8819,7 @@ index 621edd1f38..09f6cceb97 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -171,6 +186,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -171,6 +186,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -8798,24 +8830,24 @@ index 621edd1f38..09f6cceb97 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -193,6 +212,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -195,6 +214,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_coding/red_gn/moz.build third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
 index ff0cdea507..770c012bff 100644
 --- third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -8833,7 +8865,7 @@ index ff0cdea507..770c012bff 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -160,6 +171,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -160,6 +171,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -8844,7 +8876,7 @@ index ff0cdea507..770c012bff 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -176,6 +191,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -176,6 +191,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -8855,24 +8887,24 @@ index ff0cdea507..770c012bff 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -198,6 +217,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -200,6 +219,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
 index 8a5e2d696b..8937898ffb 100644
 --- third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -8890,7 +8922,7 @@ index 8a5e2d696b..8937898ffb 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -160,6 +171,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -160,6 +171,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -8901,7 +8933,7 @@ index 8a5e2d696b..8937898ffb 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -176,6 +191,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -176,6 +191,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -8912,24 +8944,24 @@ index 8a5e2d696b..8937898ffb 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -198,6 +217,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -200,6 +219,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
 index 543f023f8f..3e52c8782e 100644
 --- third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
-@@ -73,6 +73,18 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -73,6 +73,18 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -8948,7 +8980,7 @@ index 543f023f8f..3e52c8782e 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -163,6 +175,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -163,6 +175,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -8959,7 +8991,7 @@ index 543f023f8f..3e52c8782e 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -179,6 +195,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -179,6 +195,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -8970,24 +9002,24 @@ index 543f023f8f..3e52c8782e 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -211,6 +231,12 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
+@@ -214,6 +234,12 @@
+ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
  
      DEFINES["WEBRTC_CODEC_ISAC"] = True
- 
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
 +    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
 diff --git third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
 index e831769c57..e2d3a94841 100644
 --- third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
-@@ -73,6 +73,18 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -73,6 +73,18 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -9006,7 +9038,7 @@ index e831769c57..e2d3a94841 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -170,6 +182,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -170,6 +182,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -9017,7 +9049,7 @@ index e831769c57..e2d3a94841 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -186,6 +202,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -186,6 +202,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -9028,24 +9060,24 @@ index e831769c57..e2d3a94841 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -218,6 +238,12 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
+@@ -221,6 +241,12 @@
+ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
  
      DEFINES["WEBRTC_CODEC_ISAC"] = True
- 
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
 +    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
 diff --git third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
 index fa94ad5248..7f242d4ccd 100644
 --- third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
-@@ -72,6 +72,18 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -72,6 +72,18 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -9064,7 +9096,7 @@ index fa94ad5248..7f242d4ccd 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -162,6 +174,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +174,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -9075,7 +9107,7 @@ index fa94ad5248..7f242d4ccd 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -178,6 +194,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -178,6 +194,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -9086,19 +9118,19 @@ index fa94ad5248..7f242d4ccd 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -210,6 +230,12 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
+@@ -213,6 +233,12 @@
+ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
  
      DEFINES["WEBRTC_CODEC_ISAC"] = True
- 
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
 +    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
 diff --git third_party/libwebrtc/modules/audio_device/audio_device_api_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_api_gn/moz.build
 index 0680df2546..9eb57026b1 100644
 --- third_party/libwebrtc/modules/audio_device/audio_device_api_gn/moz.build
@@ -9147,7 +9179,7 @@ diff --git third_party/libwebrtc/modules/audio_device/audio_device_buffer_gn/moz
 index 8e1e8c6eea..99aed058a2 100644
 --- third_party/libwebrtc/modules/audio_device/audio_device_buffer_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_device/audio_device_buffer_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -9165,7 +9197,7 @@ index 8e1e8c6eea..99aed058a2 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -161,6 +172,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +172,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -9176,7 +9208,7 @@ index 8e1e8c6eea..99aed058a2 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -177,6 +192,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -177,6 +192,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -9187,19 +9219,19 @@ index 8e1e8c6eea..99aed058a2 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -199,6 +218,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -201,6 +220,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_device/audio_device_default_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_default_gn/moz.build
 index a079f00e51..b73f2f5bf0 100644
 --- third_party/libwebrtc/modules/audio_device/audio_device_default_gn/moz.build
@@ -9248,7 +9280,7 @@ diff --git third_party/libwebrtc/modules/audio_device/audio_device_generic_gn/mo
 index ff6ced9576..ab33cf8f57 100644
 --- third_party/libwebrtc/modules/audio_device/audio_device_generic_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_device/audio_device_generic_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -9266,7 +9298,7 @@ index ff6ced9576..ab33cf8f57 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -160,6 +171,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -160,6 +171,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -9277,7 +9309,7 @@ index ff6ced9576..ab33cf8f57 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -176,6 +191,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -176,6 +191,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -9288,19 +9320,19 @@ index ff6ced9576..ab33cf8f57 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -198,6 +217,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -200,6 +219,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
 index f57f39f961..a49062054a 100644
 --- third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
@@ -9349,7 +9381,7 @@ diff --git third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.b
 index c67982918f..296eea9c6d 100644
 --- third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.build
-@@ -71,6 +71,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -71,6 +71,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -9367,7 +9399,7 @@ index c67982918f..296eea9c6d 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -165,6 +176,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +176,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -9378,7 +9410,7 @@ index c67982918f..296eea9c6d 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -181,6 +196,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -181,6 +196,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -9389,24 +9421,24 @@ index c67982918f..296eea9c6d 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -203,6 +222,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -205,6 +224,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
 index 6ef7c5724e..fc01f3952e 100644
 --- third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -9424,7 +9456,7 @@ index 6ef7c5724e..fc01f3952e 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -160,6 +171,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -160,6 +171,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -9435,7 +9467,7 @@ index 6ef7c5724e..fc01f3952e 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -176,6 +191,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -176,6 +191,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -9446,24 +9478,24 @@ index 6ef7c5724e..fc01f3952e 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -198,6 +217,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -200,6 +219,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
 index cf7151974d..95d9fb125a 100644
 --- third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
-@@ -70,6 +70,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -70,6 +70,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -9481,7 +9513,7 @@ index cf7151974d..95d9fb125a 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -163,6 +174,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -163,6 +174,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -9492,7 +9524,7 @@ index cf7151974d..95d9fb125a 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -179,6 +194,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -179,6 +194,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -9503,19 +9535,19 @@ index cf7151974d..95d9fb125a 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -201,6 +220,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -203,6 +222,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
 index b1898d53ae..04f8b9d9e5 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
@@ -9753,7 +9785,7 @@ diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
 index a1dbc7c8d7..6f82564ed9 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
-@@ -121,6 +121,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -121,6 +121,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -9771,7 +9803,7 @@ index a1dbc7c8d7..6f82564ed9 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -214,6 +225,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -214,6 +225,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -9782,7 +9814,7 @@ index a1dbc7c8d7..6f82564ed9 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -230,6 +245,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -230,6 +245,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -9793,19 +9825,19 @@ index a1dbc7c8d7..6f82564ed9 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -252,6 +271,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -254,6 +273,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
 index d55b326e7c..f3c8f121e9 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
@@ -10030,7 +10062,7 @@ diff --git third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump
 index 35e3329585..834afb7998 100644
 --- third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -10048,7 +10080,7 @@ index 35e3329585..834afb7998 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -10059,7 +10091,7 @@ index 35e3329585..834afb7998 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -10070,24 +10102,24 @@ index 35e3329585..834afb7998 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
 index efc4513c9e..392e0f4ffa 100644
 --- third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -10105,7 +10137,7 @@ index efc4513c9e..392e0f4ffa 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -10116,7 +10148,7 @@ index efc4513c9e..392e0f4ffa 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -10127,24 +10159,24 @@ index efc4513c9e..392e0f4ffa 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
 index 3efc2af585..afdd337a76 100644
 --- third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
-@@ -69,6 +69,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -69,6 +69,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -10162,7 +10194,7 @@ index 3efc2af585..afdd337a76 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -170,6 +181,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -170,6 +181,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -10173,7 +10205,7 @@ index 3efc2af585..afdd337a76 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -186,6 +201,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -186,6 +201,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -10184,24 +10216,24 @@ index 3efc2af585..afdd337a76 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -208,6 +227,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -210,6 +229,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
 index cb7f900073..455a94feb0 100644
 --- third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -10219,7 +10251,7 @@ index cb7f900073..455a94feb0 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -161,6 +172,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +172,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -10230,7 +10262,7 @@ index cb7f900073..455a94feb0 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -177,6 +192,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -177,6 +192,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -10241,19 +10273,19 @@ index cb7f900073..455a94feb0 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -199,6 +218,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -201,6 +220,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
 index 2a0e9bc2c3..f14b4ffa4b 100644
 --- third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
@@ -10346,7 +10378,7 @@ diff --git third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.
 index 9cdc513dff..b73ca0a1f5 100644
 --- third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -10364,7 +10396,7 @@ index 9cdc513dff..b73ca0a1f5 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -161,6 +172,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +172,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -10375,7 +10407,7 @@ index 9cdc513dff..b73ca0a1f5 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -177,6 +192,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -177,6 +192,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -10386,24 +10418,24 @@ index 9cdc513dff..b73ca0a1f5 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -199,6 +218,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -201,6 +220,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
 index c4ba6d6103..8c968bec46 100644
 --- third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
-@@ -69,6 +69,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -69,6 +69,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -10421,7 +10453,7 @@ index c4ba6d6103..8c968bec46 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -162,6 +173,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +173,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -10432,7 +10464,7 @@ index c4ba6d6103..8c968bec46 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -178,6 +193,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -178,6 +193,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -10443,24 +10475,24 @@ index c4ba6d6103..8c968bec46 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -200,6 +219,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -202,6 +221,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gn/moz.build
 index 873fc73ed2..7c30c4307e 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gn/moz.build
-@@ -71,6 +71,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -71,6 +71,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -10478,7 +10510,7 @@ index 873fc73ed2..7c30c4307e 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -164,6 +175,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -164,6 +175,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -10489,7 +10521,7 @@ index 873fc73ed2..7c30c4307e 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -180,6 +195,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -180,6 +195,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -10500,24 +10532,24 @@ index 873fc73ed2..7c30c4307e 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -202,6 +221,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -204,6 +223,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
 index c082e8be20..9b5c4a102a 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -10535,7 +10567,7 @@ index c082e8be20..9b5c4a102a 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -10546,7 +10578,7 @@ index c082e8be20..9b5c4a102a 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -10557,24 +10589,24 @@ index c082e8be20..9b5c4a102a 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
 index bb2364621f..9cc868d42e 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -10592,7 +10624,7 @@ index bb2364621f..9cc868d42e 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -10603,7 +10635,7 @@ index bb2364621f..9cc868d42e 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -10614,24 +10646,24 @@ index bb2364621f..9cc868d42e 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
 index c2278b5584..dceb5a5f40 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
-@@ -70,6 +70,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -70,6 +70,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -10649,7 +10681,7 @@ index c2278b5584..dceb5a5f40 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -163,6 +174,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -163,6 +174,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -10660,7 +10692,7 @@ index c2278b5584..dceb5a5f40 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -179,6 +194,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -179,6 +194,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -10671,24 +10703,24 @@ index c2278b5584..dceb5a5f40 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -201,6 +220,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -203,6 +222,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
 index 7cbfedef3a..aca6db5084 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -10706,7 +10738,7 @@ index 7cbfedef3a..aca6db5084 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -10717,7 +10749,7 @@ index 7cbfedef3a..aca6db5084 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -10728,24 +10760,24 @@ index 7cbfedef3a..aca6db5084 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/level_estimation_agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/level_estimation_agc_gn/moz.build
 index 6a681f6d5e..ca8d980f38 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/level_estimation_agc_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/level_estimation_agc_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -10763,7 +10795,7 @@ index 6a681f6d5e..ca8d980f38 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -161,6 +172,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +172,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -10774,7 +10806,7 @@ index 6a681f6d5e..ca8d980f38 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -177,6 +192,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -177,6 +192,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -10785,24 +10817,24 @@ index 6a681f6d5e..ca8d980f38 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -199,6 +218,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -201,6 +220,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
 index af09244a52..a57f14ba6a 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
-@@ -71,6 +71,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -71,6 +71,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -10820,7 +10852,7 @@ index af09244a52..a57f14ba6a 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -164,6 +175,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -164,6 +175,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -10831,7 +10863,7 @@ index af09244a52..a57f14ba6a 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -180,6 +195,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -180,6 +195,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -10842,24 +10874,24 @@ index af09244a52..a57f14ba6a 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -202,6 +221,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -204,6 +223,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
 index b6cae79851..2a219468af 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
-@@ -75,6 +75,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -75,6 +75,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -10877,7 +10909,7 @@ index b6cae79851..2a219468af 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -168,6 +179,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -168,6 +179,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -10888,7 +10920,7 @@ index b6cae79851..2a219468af 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -184,6 +199,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -184,6 +199,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -10899,24 +10931,24 @@ index b6cae79851..2a219468af 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -206,6 +225,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -208,6 +227,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad_with_level_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad_with_level_gn/moz.build
 index d1b3bee93f..54fd581f80 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad_with_level_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad_with_level_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -10934,7 +10966,7 @@ index d1b3bee93f..54fd581f80 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -160,6 +171,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -160,6 +171,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -10945,7 +10977,7 @@ index d1b3bee93f..54fd581f80 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -176,6 +191,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -176,6 +191,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -10956,24 +10988,24 @@ index d1b3bee93f..54fd581f80 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -198,6 +217,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -200,6 +219,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/api_gn/moz.build third_party/libwebrtc/modules/audio_processing/api_gn/moz.build
 index dfab8ef20b..35d7628efa 100644
 --- third_party/libwebrtc/modules/audio_processing/api_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/api_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -10991,7 +11023,7 @@ index dfab8ef20b..35d7628efa 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -11002,7 +11034,7 @@ index dfab8ef20b..35d7628efa 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -11013,24 +11045,24 @@ index dfab8ef20b..35d7628efa 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
 index 833f44927f..95ff1333b5 100644
 --- third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -11048,7 +11080,7 @@ index 833f44927f..95ff1333b5 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -161,6 +172,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +172,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -11059,7 +11091,7 @@ index 833f44927f..95ff1333b5 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -177,6 +192,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -177,6 +192,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -11070,24 +11102,24 @@ index 833f44927f..95ff1333b5 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -199,6 +218,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -201,6 +220,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
 index ef50066aa0..f35e2bb673 100644
 --- third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
-@@ -70,6 +70,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -70,6 +70,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -11105,7 +11137,7 @@ index ef50066aa0..f35e2bb673 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -163,6 +174,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -163,6 +174,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -11116,7 +11148,7 @@ index ef50066aa0..f35e2bb673 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -179,6 +194,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -179,6 +194,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -11127,24 +11159,24 @@ index ef50066aa0..f35e2bb673 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -201,6 +220,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -203,6 +222,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
 index aa637aa2ca..3ece88a35d 100644
 --- third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -11162,7 +11194,7 @@ index aa637aa2ca..3ece88a35d 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -11173,7 +11205,7 @@ index aa637aa2ca..3ece88a35d 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -11184,19 +11216,19 @@ index aa637aa2ca..3ece88a35d 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
 index 4aface66d6..d93c4f540e 100644
 --- third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
@@ -11245,7 +11277,7 @@ diff --git third_party/libwebrtc/modules/audio_processing/audio_processing_gn/mo
 index f20b13bd0a..06d3996410 100644
 --- third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
-@@ -82,6 +82,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -82,6 +82,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -11263,7 +11295,7 @@ index f20b13bd0a..06d3996410 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -175,6 +186,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -175,6 +186,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -11274,7 +11306,7 @@ index f20b13bd0a..06d3996410 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -191,6 +206,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -191,6 +206,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -11285,24 +11317,24 @@ index f20b13bd0a..06d3996410 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -213,6 +232,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -215,6 +234,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build
 index 1eb1f12ac7..1047578c1c 100644
 --- third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build
-@@ -63,6 +63,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -63,6 +63,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -11320,7 +11352,7 @@ index 1eb1f12ac7..1047578c1c 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -145,6 +156,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -145,6 +156,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -11331,7 +11363,7 @@ index 1eb1f12ac7..1047578c1c 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -161,6 +176,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +176,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -11342,24 +11374,24 @@ index 1eb1f12ac7..1047578c1c 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -183,6 +202,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -185,6 +204,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/config_gn/moz.build third_party/libwebrtc/modules/audio_processing/config_gn/moz.build
 index efbaa9991f..01b95bf107 100644
 --- third_party/libwebrtc/modules/audio_processing/config_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/config_gn/moz.build
-@@ -63,6 +63,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -63,6 +63,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -11377,7 +11409,7 @@ index efbaa9991f..01b95bf107 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -145,6 +156,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -145,6 +156,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -11388,7 +11420,7 @@ index efbaa9991f..01b95bf107 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -161,6 +176,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +176,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -11399,24 +11431,24 @@ index efbaa9991f..01b95bf107 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -183,6 +202,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -185,6 +204,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
 index 698d52d09c..5790ee2471 100644
 --- third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -11434,7 +11466,7 @@ index 698d52d09c..5790ee2471 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -160,6 +171,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -160,6 +171,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -11445,7 +11477,7 @@ index 698d52d09c..5790ee2471 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -176,6 +191,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -176,6 +191,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -11456,24 +11488,24 @@ index 698d52d09c..5790ee2471 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -198,6 +217,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -200,6 +219,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
 index e7b4bd602d..cdba1e73d7 100644
 --- third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
-@@ -80,6 +80,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -80,6 +80,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -11491,7 +11523,7 @@ index e7b4bd602d..cdba1e73d7 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -173,6 +184,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -173,6 +184,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -11502,7 +11534,7 @@ index e7b4bd602d..cdba1e73d7 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -189,6 +204,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -189,6 +204,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -11513,24 +11545,24 @@ index e7b4bd602d..cdba1e73d7 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -211,6 +230,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -213,6 +232,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build
 index aaaed22eeb..174e3ec82d 100644
 --- third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -11548,7 +11580,7 @@ index aaaed22eeb..174e3ec82d 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -160,6 +171,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -160,6 +171,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -11559,7 +11591,7 @@ index aaaed22eeb..174e3ec82d 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -176,6 +191,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -176,6 +191,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -11570,24 +11602,24 @@ index aaaed22eeb..174e3ec82d 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -198,6 +217,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -200,6 +219,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
 index a65c04f233..f81dd6ac8b 100644
 --- third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -11605,7 +11637,7 @@ index a65c04f233..f81dd6ac8b 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -11616,7 +11648,7 @@ index a65c04f233..f81dd6ac8b 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -11627,19 +11659,19 @@ index a65c04f233..f81dd6ac8b 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build
 index e4fedef6fe..00ff1a6f9c 100644
 --- third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build
@@ -11688,7 +11720,7 @@ diff --git third_party/libwebrtc/modules/audio_processing/transient/transient_su
 index e161f74eb6..ee40243cb5 100644
 --- third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build
-@@ -71,6 +71,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -71,6 +71,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -11706,7 +11738,7 @@ index e161f74eb6..ee40243cb5 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -164,6 +175,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -164,6 +175,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -11717,7 +11749,7 @@ index e161f74eb6..ee40243cb5 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -180,6 +195,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -180,6 +195,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -11728,24 +11760,24 @@ index e161f74eb6..ee40243cb5 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -202,6 +221,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -204,6 +223,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
 index b2589fa2cb..0b6f561dfa 100644
 --- third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -11763,7 +11795,7 @@ index b2589fa2cb..0b6f561dfa 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -11774,7 +11806,7 @@ index b2589fa2cb..0b6f561dfa 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -11785,24 +11817,24 @@ index b2589fa2cb..0b6f561dfa 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
 index cf2a4f08e5..5b75fba966 100644
 --- third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -11820,7 +11852,7 @@ index cf2a4f08e5..5b75fba966 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -150,6 +161,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -150,6 +161,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -11831,7 +11863,7 @@ index cf2a4f08e5..5b75fba966 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -166,6 +181,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -166,6 +181,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -11842,24 +11874,24 @@ index cf2a4f08e5..5b75fba966 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -188,6 +207,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -190,6 +209,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
 index bd2401a7cb..8d497539ac 100644
 --- third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -11877,7 +11909,7 @@ index bd2401a7cb..8d497539ac 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -11888,7 +11920,7 @@ index bd2401a7cb..8d497539ac 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -11899,24 +11931,24 @@ index bd2401a7cb..8d497539ac 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
 index 06000cbc10..cf42277c70 100644
 --- third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
-@@ -74,6 +74,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -74,6 +74,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -11934,7 +11966,7 @@ index 06000cbc10..cf42277c70 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -167,6 +178,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -167,6 +178,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -11945,7 +11977,7 @@ index 06000cbc10..cf42277c70 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -183,6 +198,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -183,6 +198,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -11956,24 +11988,24 @@ index 06000cbc10..cf42277c70 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -205,6 +224,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -207,6 +226,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/audio_processing/voice_detection_gn/moz.build third_party/libwebrtc/modules/audio_processing/voice_detection_gn/moz.build
 index bea08f119f..c104d07962 100644
 --- third_party/libwebrtc/modules/audio_processing/voice_detection_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/voice_detection_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -11991,7 +12023,7 @@ index bea08f119f..c104d07962 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -160,6 +171,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -160,6 +171,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -12002,7 +12034,7 @@ index bea08f119f..c104d07962 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -176,6 +191,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -176,6 +191,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -12013,24 +12045,24 @@ index bea08f119f..c104d07962 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -198,6 +217,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -200,6 +219,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
 index 6b31661826..d0d5e69729 100644
 --- third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
-@@ -69,6 +69,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -69,6 +69,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -12048,7 +12080,7 @@ index 6b31661826..d0d5e69729 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -163,6 +174,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -163,6 +174,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -12059,7 +12091,7 @@ index 6b31661826..d0d5e69729 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -179,6 +194,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -179,6 +194,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -12070,24 +12102,24 @@ index 6b31661826..d0d5e69729 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -201,6 +220,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -203,6 +222,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
 index d98d1f4660..21e9b12b4d 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -12105,7 +12137,7 @@ index d98d1f4660..21e9b12b4d 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -12116,7 +12148,7 @@ index d98d1f4660..21e9b12b4d 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -12127,24 +12159,24 @@ index d98d1f4660..21e9b12b4d 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
 index 9eabaa60af..cb668afcb1 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
-@@ -69,6 +69,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -69,6 +69,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -12162,7 +12194,7 @@ index 9eabaa60af..cb668afcb1 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -163,6 +174,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -163,6 +174,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -12173,7 +12205,7 @@ index 9eabaa60af..cb668afcb1 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -179,6 +194,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -179,6 +194,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -12184,24 +12216,24 @@ index 9eabaa60af..cb668afcb1 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -201,6 +220,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -203,6 +222,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
 index 38da3f33ec..27afbf8699 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
-@@ -74,6 +74,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -74,6 +74,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -12219,7 +12251,7 @@ index 38da3f33ec..27afbf8699 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -168,6 +179,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -168,6 +179,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -12230,7 +12262,7 @@ index 38da3f33ec..27afbf8699 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -184,6 +199,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -184,6 +199,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -12241,24 +12273,24 @@ index 38da3f33ec..27afbf8699 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -206,6 +225,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -208,6 +227,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
 index 526d42a6da..c10bde89a7 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
-@@ -69,6 +69,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -69,6 +69,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -12276,7 +12308,7 @@ index 526d42a6da..c10bde89a7 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -163,6 +174,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -163,6 +174,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -12287,7 +12319,7 @@ index 526d42a6da..c10bde89a7 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -179,6 +194,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -179,6 +194,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -12298,24 +12330,24 @@ index 526d42a6da..c10bde89a7 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -201,6 +220,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -203,6 +222,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
 index a36d351ab1..4857832777 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -12333,7 +12365,7 @@ index a36d351ab1..4857832777 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -12344,7 +12376,7 @@ index a36d351ab1..4857832777 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -12355,24 +12387,24 @@ index a36d351ab1..4857832777 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_controller_gn/moz.build
 index 49fc53c47c..96a190f648 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_controller_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_controller_gn/moz.build
-@@ -70,6 +70,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -70,6 +70,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -12390,7 +12422,7 @@ index 49fc53c47c..96a190f648 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -164,6 +175,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -164,6 +175,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -12401,7 +12433,7 @@ index 49fc53c47c..96a190f648 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -180,6 +195,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -180,6 +195,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -12412,24 +12444,24 @@ index 49fc53c47c..96a190f648 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -202,6 +221,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -204,6 +223,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
 index e065f6b8d6..de0945c32f 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -12447,7 +12479,7 @@ index e065f6b8d6..de0945c32f 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -162,6 +173,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +173,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -12458,7 +12490,7 @@ index e065f6b8d6..de0945c32f 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -178,6 +193,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -178,6 +193,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -12469,24 +12501,24 @@ index e065f6b8d6..de0945c32f 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -200,6 +219,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -202,6 +221,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
 index 1a26d6fbed..ef60392c44 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -12504,7 +12536,7 @@ index 1a26d6fbed..ef60392c44 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -12515,7 +12547,7 @@ index 1a26d6fbed..ef60392c44 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -12526,24 +12558,24 @@ index 1a26d6fbed..ef60392c44 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
 index ec5aa36c78..873daa331e 100644
 --- third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -12561,7 +12593,7 @@ index ec5aa36c78..873daa331e 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -162,6 +173,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +173,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -12572,7 +12604,7 @@ index ec5aa36c78..873daa331e 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -178,6 +193,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -178,6 +193,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -12583,24 +12615,24 @@ index ec5aa36c78..873daa331e 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -200,6 +219,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -202,6 +221,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
 index 9e1db4a2ab..c421bb524d 100644
 --- third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
-@@ -69,6 +69,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -69,6 +69,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -12618,7 +12650,7 @@ index 9e1db4a2ab..c421bb524d 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -163,6 +174,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -163,6 +174,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -12629,7 +12661,7 @@ index 9e1db4a2ab..c421bb524d 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -179,6 +194,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -179,6 +194,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -12640,19 +12672,19 @@ index 9e1db4a2ab..c421bb524d 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -201,6 +220,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -203,6 +222,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
 index e2f5330283..8f0c389632 100644
 --- third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
@@ -12721,7 +12753,7 @@ diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic
 index a5cf9234d1..59ec34a46a 100644
 --- third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
 +++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
-@@ -86,6 +86,59 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -85,6 +85,59 @@
          "/third_party/libwebrtc/modules/desktop_capture/mac/window_list_utils.cc"
      ]
  
@@ -12781,7 +12813,7 @@ index a5cf9234d1..59ec34a46a 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -282,6 +335,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -262,6 +315,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -12792,7 +12824,7 @@ index a5cf9234d1..59ec34a46a 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -294,6 +351,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -274,6 +331,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -12803,19 +12835,19 @@ index a5cf9234d1..59ec34a46a 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -306,6 +367,12 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
- 
-     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
- 
+@@ -313,6 +374,12 @@
+         "/third_party/libwebrtc/modules/desktop_capture/linux/x_error_trap.cc",
+         "/third_party/libwebrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc",
+         "/third_party/libwebrtc/modules/desktop_capture/linux/x_window_property.cc"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
 index 4cf85ddfa7..0e133b2212 100644
 --- third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
@@ -12876,7 +12908,7 @@ diff --git third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
 index 6831d8a311..10af878b46 100644
 --- third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
 +++ third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
-@@ -54,6 +54,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -54,6 +54,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -12894,7 +12926,7 @@ index 6831d8a311..10af878b46 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -117,6 +128,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -117,6 +128,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -12905,7 +12937,7 @@ index 6831d8a311..10af878b46 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -129,6 +144,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -129,6 +144,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -12916,20 +12948,20 @@ index 6831d8a311..10af878b46 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -141,6 +160,12 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
- 
-     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+@@ -144,6 +163,12 @@
+ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
+     DEFINES["USE_X11"] = "1"
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
 +    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
-diff --git third_party/libwebrtc/modules/module_api_gn/moz.build third_party/libwebrtc/modules/module_api_gn/moz.build
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+diff --git third_party/libwebrtc/modules/module_api_gn/moz.build third_party/libwebrtc/modules/module_api_gn/moz.build
 index 18dcb08135..e60a418a5c 100644
 --- third_party/libwebrtc/modules/module_api_gn/moz.build
 +++ third_party/libwebrtc/modules/module_api_gn/moz.build
@@ -13065,7 +13097,7 @@ diff --git third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build thi
 index 303d47a95a..cff53a7075 100644
 --- third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
 +++ third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -13083,7 +13115,7 @@ index 303d47a95a..cff53a7075 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -13094,7 +13126,7 @@ index 303d47a95a..cff53a7075 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -13105,24 +13137,24 @@ index 303d47a95a..cff53a7075 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/pacing/pacing_gn/moz.build third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
 index f6fde08638..01d969c0c9 100644
 --- third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
 +++ third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
-@@ -73,6 +73,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -73,6 +73,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -13140,7 +13172,7 @@ index f6fde08638..01d969c0c9 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -167,6 +178,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -167,6 +178,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -13151,7 +13183,7 @@ index f6fde08638..01d969c0c9 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -183,6 +198,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -183,6 +198,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -13162,24 +13194,24 @@ index f6fde08638..01d969c0c9 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -205,6 +224,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -207,6 +226,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
 index bca6684427..599af3d257 100644
 --- third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
 +++ third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
-@@ -79,6 +79,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -79,6 +79,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -13197,7 +13229,7 @@ index bca6684427..599af3d257 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -173,6 +184,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -173,6 +184,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -13208,7 +13240,7 @@ index bca6684427..599af3d257 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -189,6 +204,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -189,6 +204,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -13219,24 +13251,24 @@ index bca6684427..599af3d257 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -211,6 +230,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -213,6 +232,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build
 index a5ec9f4951..e036ba0402 100644
 --- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build
 +++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build
-@@ -109,6 +109,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -109,6 +109,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -13254,7 +13286,7 @@ index a5ec9f4951..e036ba0402 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -203,6 +214,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -203,6 +214,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -13265,7 +13297,7 @@ index a5ec9f4951..e036ba0402 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -219,6 +234,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -219,6 +234,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -13276,24 +13308,24 @@ index a5ec9f4951..e036ba0402 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -241,6 +260,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -243,6 +262,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
 index 33a43eeed5..13217b736d 100644
 --- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
 +++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
-@@ -121,6 +121,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -121,6 +121,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -13311,7 +13343,7 @@ index 33a43eeed5..13217b736d 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -215,6 +226,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -215,6 +226,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -13322,7 +13354,7 @@ index 33a43eeed5..13217b736d 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -231,6 +246,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -231,6 +246,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -13333,24 +13365,24 @@ index 33a43eeed5..13217b736d 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -253,6 +272,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -255,6 +274,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
 index aee62695af..087ee836d1 100644
 --- third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
 +++ third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -13368,7 +13400,7 @@ index aee62695af..087ee836d1 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -13379,7 +13411,7 @@ index aee62695af..087ee836d1 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -13390,24 +13422,24 @@ index aee62695af..087ee836d1 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
 index 60e216ff55..192f544d28 100644
 --- third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
 +++ third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
-@@ -63,6 +63,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -63,6 +63,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -13425,7 +13457,7 @@ index 60e216ff55..192f544d28 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -145,6 +156,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -145,6 +156,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -13436,7 +13468,7 @@ index 60e216ff55..192f544d28 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -161,6 +176,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +176,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -13447,24 +13479,24 @@ index 60e216ff55..192f544d28 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -183,6 +202,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -185,6 +204,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
-+    CFLAGS += [
++    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
 index 4004c61364..4e7396bbec 100644
 --- third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
 +++ third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
-@@ -63,6 +63,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -63,6 +63,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -13482,7 +13514,7 @@ index 4004c61364..4e7396bbec 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -145,6 +156,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -145,6 +156,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -13493,7 +13525,7 @@ index 4004c61364..4e7396bbec 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -161,6 +176,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +176,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -13504,24 +13536,23 @@ index 4004c61364..4e7396bbec 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -183,6 +202,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -185,6 +204,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
-+    CFLAGS += [
++    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
-index 03a10df48e..91630f3272 100644
 --- third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
 +++ third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -13539,7 +13570,7 @@ index 03a10df48e..91630f3272 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -13550,7 +13581,7 @@ index 03a10df48e..91630f3272 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -13561,24 +13592,24 @@ index 03a10df48e..91630f3272 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
-+    CFLAGS += [
++    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/utility/utility_gn/moz.build third_party/libwebrtc/modules/utility/utility_gn/moz.build
 index e0b16b4073..5881ab6869 100644
 --- third_party/libwebrtc/modules/utility/utility_gn/moz.build
 +++ third_party/libwebrtc/modules/utility/utility_gn/moz.build
-@@ -72,6 +72,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -72,6 +72,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -13596,7 +13627,7 @@ index e0b16b4073..5881ab6869 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -165,6 +176,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +176,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -13607,7 +13638,7 @@ index e0b16b4073..5881ab6869 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -181,6 +196,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -181,6 +196,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -13618,24 +13649,24 @@ index e0b16b4073..5881ab6869 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -203,6 +222,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -205,6 +224,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
 index 3b4e237101..0f5c345da0 100644
 --- third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
 +++ third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
-@@ -64,6 +64,22 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -64,6 +64,22 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -13658,7 +13689,7 @@ index 3b4e237101..0f5c345da0 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -179,6 +195,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -179,6 +195,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -13669,7 +13700,7 @@ index 3b4e237101..0f5c345da0 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -195,6 +215,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -195,6 +215,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -13680,24 +13711,24 @@ index 3b4e237101..0f5c345da0 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -213,6 +237,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -215,6 +239,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build
 index 86bc0e277d..c0f82da6ef 100644
 --- third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build
 +++ third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build
-@@ -72,6 +72,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -72,6 +72,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -13715,7 +13746,7 @@ index 86bc0e277d..c0f82da6ef 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -166,6 +177,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -166,6 +177,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -13726,7 +13757,7 @@ index 86bc0e277d..c0f82da6ef 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -182,6 +197,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -182,6 +197,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -13737,24 +13768,24 @@ index 86bc0e277d..c0f82da6ef 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -204,6 +223,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -206,6 +225,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
 index 8519e21097..6181f3b482 100644
 --- third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -13772,7 +13803,7 @@ index 8519e21097..6181f3b482 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -13783,7 +13814,7 @@ index 8519e21097..6181f3b482 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -13794,19 +13825,19 @@ index 8519e21097..6181f3b482 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
 index 5f42fd5adb..7836c9170f 100644
 --- third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
@@ -13855,7 +13886,7 @@ diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_deco
 index 69874c53ac..b8db8cd9cc 100644
 --- third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_decoder_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_decoder_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -13873,7 +13904,7 @@ index 69874c53ac..b8db8cd9cc 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -13884,7 +13915,7 @@ index 69874c53ac..b8db8cd9cc 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -13895,24 +13926,24 @@ index 69874c53ac..b8db8cd9cc 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build
 index f6af0518a3..d1f6bff5e2 100644
 --- third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -13930,7 +13961,7 @@ index f6af0518a3..d1f6bff5e2 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -13941,7 +13972,7 @@ index f6af0518a3..d1f6bff5e2 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -13952,24 +13983,24 @@ index f6af0518a3..d1f6bff5e2 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/video_coding/deprecated/nack_module_gn/moz.build third_party/libwebrtc/modules/video_coding/deprecated/nack_module_gn/moz.build
 index 4ed27aaed8..2a4a1ff7dd 100644
 --- third_party/libwebrtc/modules/video_coding/deprecated/nack_module_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/deprecated/nack_module_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -13987,7 +14018,7 @@ index 4ed27aaed8..2a4a1ff7dd 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -160,6 +171,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -160,6 +171,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -13998,7 +14029,7 @@ index 4ed27aaed8..2a4a1ff7dd 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -176,6 +191,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -176,6 +191,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -14009,24 +14040,24 @@ index 4ed27aaed8..2a4a1ff7dd 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -198,6 +217,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -200,6 +219,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
 index d8d1780d20..25e50ff6fb 100644
 --- third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -14044,7 +14075,7 @@ index d8d1780d20..25e50ff6fb 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -162,6 +173,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +173,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -14055,7 +14086,7 @@ index d8d1780d20..25e50ff6fb 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -178,6 +193,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -178,6 +193,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -14066,24 +14097,24 @@ index d8d1780d20..25e50ff6fb 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -200,6 +219,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -202,6 +221,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
 index 8b09cfc9ec..f3e5353ab5 100644
 --- third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -14101,7 +14132,7 @@ index 8b09cfc9ec..f3e5353ab5 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -14112,7 +14143,7 @@ index 8b09cfc9ec..f3e5353ab5 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -14123,24 +14154,24 @@ index 8b09cfc9ec..f3e5353ab5 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/video_coding/nack_module_gn/moz.build third_party/libwebrtc/modules/video_coding/nack_module_gn/moz.build
 index d6059d52d2..2baa67b084 100644
 --- third_party/libwebrtc/modules/video_coding/nack_module_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/nack_module_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -14158,7 +14189,7 @@ index d6059d52d2..2baa67b084 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -161,6 +172,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +172,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -14169,7 +14200,7 @@ index d6059d52d2..2baa67b084 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -177,6 +192,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -177,6 +192,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -14180,24 +14211,24 @@ index d6059d52d2..2baa67b084 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -199,6 +218,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -201,6 +220,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
 index e073ac2c3f..e9bb1da50b 100644
 --- third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
-@@ -69,6 +69,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -69,6 +69,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -14215,7 +14246,7 @@ index e073ac2c3f..e9bb1da50b 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -163,6 +174,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -163,6 +174,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -14226,7 +14257,7 @@ index e073ac2c3f..e9bb1da50b 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -179,6 +194,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -179,6 +194,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -14237,24 +14268,24 @@ index e073ac2c3f..e9bb1da50b 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -201,6 +220,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -203,6 +222,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
 index 8c0f15071b..190ae3c4d6 100644
 --- third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
-@@ -88,6 +88,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -88,6 +88,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -14272,7 +14303,7 @@ index 8c0f15071b..190ae3c4d6 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -182,6 +193,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -182,6 +193,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -14283,7 +14314,7 @@ index 8c0f15071b..190ae3c4d6 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -198,6 +213,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -198,6 +213,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -14294,24 +14325,24 @@ index 8c0f15071b..190ae3c4d6 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -220,6 +239,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -222,6 +241,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
 index b6e4b928cf..aef33114b0 100644
 --- third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
-@@ -77,6 +77,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -77,6 +77,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -14329,7 +14360,7 @@ index b6e4b928cf..aef33114b0 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -171,6 +182,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -171,6 +182,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -14340,7 +14371,7 @@ index b6e4b928cf..aef33114b0 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -187,6 +202,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -187,6 +202,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -14351,24 +14382,24 @@ index b6e4b928cf..aef33114b0 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -209,6 +228,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -211,6 +230,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
-+        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
++        "-msse2"
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
 index 2dced7c944..efa5dcadbb 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
-@@ -73,6 +73,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -73,6 +73,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -14386,7 +14417,7 @@ index 2dced7c944..efa5dcadbb 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -167,6 +178,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -167,6 +178,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -14397,7 +14428,7 @@ index 2dced7c944..efa5dcadbb 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -183,6 +198,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -183,6 +198,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -14408,24 +14439,24 @@ index 2dced7c944..efa5dcadbb 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -205,6 +224,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -207,6 +226,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_multiplex_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_multiplex_gn/moz.build
 index 35b41b3c67..f82513bdc4 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_multiplex_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_multiplex_gn/moz.build
-@@ -71,6 +71,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -71,6 +71,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -14443,7 +14474,7 @@ index 35b41b3c67..f82513bdc4 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -165,6 +176,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +176,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -14454,7 +14485,7 @@ index 35b41b3c67..f82513bdc4 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -181,6 +196,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -181,6 +196,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -14465,24 +14496,24 @@ index 35b41b3c67..f82513bdc4 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -203,6 +222,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -205,6 +224,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
 index 2315a41528..ecffacb782 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
-@@ -72,6 +72,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -72,6 +72,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -14500,7 +14531,7 @@ index 2315a41528..ecffacb782 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -166,6 +177,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -166,6 +177,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -14511,7 +14542,7 @@ index 2315a41528..ecffacb782 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -182,6 +197,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -182,6 +197,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -14522,24 +14553,24 @@ index 2315a41528..ecffacb782 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -204,6 +223,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -206,6 +225,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
 index 4eef28d19b..4c068c393b 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
-@@ -73,6 +73,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -73,6 +73,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -14557,7 +14588,7 @@ index 4eef28d19b..4c068c393b 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -167,6 +178,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -167,6 +178,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -14568,7 +14599,7 @@ index 4eef28d19b..4c068c393b 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -183,6 +198,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -183,6 +198,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -14579,24 +14610,24 @@ index 4eef28d19b..4c068c393b 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -205,6 +224,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -207,6 +226,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
 index cd75be3c84..9d1ce64bba 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
-@@ -70,6 +70,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -70,6 +70,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -14614,7 +14645,7 @@ index cd75be3c84..9d1ce64bba 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -164,6 +175,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -164,6 +175,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -14625,7 +14656,7 @@ index cd75be3c84..9d1ce64bba 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -180,6 +195,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -180,6 +195,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -14636,24 +14667,24 @@ index cd75be3c84..9d1ce64bba 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -202,6 +221,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -204,6 +223,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
 index 4b0b804423..581c06d007 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
-@@ -69,6 +69,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -69,6 +69,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -14671,7 +14702,7 @@ index 4b0b804423..581c06d007 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -163,6 +174,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -163,6 +174,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -14682,7 +14713,7 @@ index 4b0b804423..581c06d007 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -179,6 +194,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -179,6 +194,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -14693,19 +14724,19 @@ index 4b0b804423..581c06d007 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -201,6 +220,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -203,6 +222,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/video_processing/denoiser_filter_gn/moz.build third_party/libwebrtc/modules/video_processing/denoiser_filter_gn/moz.build
 index 7407051e7e..5665ec1796 100644
 --- third_party/libwebrtc/modules/video_processing/denoiser_filter_gn/moz.build
@@ -14754,7 +14785,7 @@ diff --git third_party/libwebrtc/modules/video_processing/video_processing_gn/mo
 index f7b210e234..08ca80445c 100644
 --- third_party/libwebrtc/modules/video_processing/video_processing_gn/moz.build
 +++ third_party/libwebrtc/modules/video_processing/video_processing_gn/moz.build
-@@ -74,6 +74,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -74,6 +74,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -14772,7 +14803,7 @@ index f7b210e234..08ca80445c 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -168,6 +179,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -168,6 +179,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -14783,7 +14814,7 @@ index f7b210e234..08ca80445c 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -184,6 +199,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -184,6 +199,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -14794,19 +14825,19 @@ index f7b210e234..08ca80445c 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -206,6 +225,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -208,6 +227,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/modules/video_processing/video_processing_neon_gn/moz.build third_party/libwebrtc/modules/video_processing/video_processing_neon_gn/moz.build
 index 476e28a19c..8cf4b20aaf 100644
 --- third_party/libwebrtc/modules/video_processing/video_processing_neon_gn/moz.build
@@ -15022,7 +15053,7 @@ diff --git third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build th
 index 1562c0c15e..a317bbaed1 100644
 --- third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -15040,7 +15071,7 @@ index 1562c0c15e..a317bbaed1 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -15051,7 +15082,7 @@ index 1562c0c15e..a317bbaed1 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -15062,24 +15093,24 @@ index 1562c0c15e..a317bbaed1 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/checks_gn/moz.build third_party/libwebrtc/rtc_base/checks_gn/moz.build
 index cd0f53f896..9bc0698b2a 100644
 --- third_party/libwebrtc/rtc_base/checks_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/checks_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -15097,7 +15128,7 @@ index cd0f53f896..9bc0698b2a 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -15108,7 +15139,7 @@ index cd0f53f896..9bc0698b2a 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -15119,19 +15150,19 @@ index cd0f53f896..9bc0698b2a 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
 index 6d4c494876..f53819d83e 100644
 --- third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
@@ -15180,7 +15211,7 @@ diff --git third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build third_par
 index 4da8d7835a..5a2fc712b7 100644
 --- third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -15198,7 +15229,7 @@ index 4da8d7835a..5a2fc712b7 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -15209,7 +15240,7 @@ index 4da8d7835a..5a2fc712b7 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -15220,19 +15251,19 @@ index 4da8d7835a..5a2fc712b7 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/deprecation_gn/moz.build third_party/libwebrtc/rtc_base/deprecation_gn/moz.build
 index e270de4c35..e3ba310b6f 100644
 --- third_party/libwebrtc/rtc_base/deprecation_gn/moz.build
@@ -15325,7 +15356,7 @@ diff --git third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.buil
 index 82b2d0f65b..5c95c7e43a 100644
 --- third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -15343,7 +15374,7 @@ index 82b2d0f65b..5c95c7e43a 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -15354,7 +15385,7 @@ index 82b2d0f65b..5c95c7e43a 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -15365,24 +15396,24 @@ index 82b2d0f65b..5c95c7e43a 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
 index 5d3674f5ec..0fe9133e79 100644
 --- third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -15400,7 +15431,7 @@ index 5d3674f5ec..0fe9133e79 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -15411,7 +15442,7 @@ index 5d3674f5ec..0fe9133e79 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -15422,24 +15453,24 @@ index 5d3674f5ec..0fe9133e79 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build
 index 09a8a30dcc..6edf8f0f03 100644
 --- third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -15457,7 +15488,7 @@ index 09a8a30dcc..6edf8f0f03 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -15468,7 +15499,7 @@ index 09a8a30dcc..6edf8f0f03 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -15479,24 +15510,24 @@ index 09a8a30dcc..6edf8f0f03 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
 index 9affe97b83..b1b560526a 100644
 --- third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
-@@ -70,6 +70,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -70,6 +70,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -15514,7 +15545,7 @@ index 9affe97b83..b1b560526a 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -156,6 +167,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -156,6 +167,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -15525,7 +15556,7 @@ index 9affe97b83..b1b560526a 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -172,6 +187,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -172,6 +187,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -15536,24 +15567,24 @@ index 9affe97b83..b1b560526a 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -194,6 +213,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -196,6 +215,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/experiments/jitter_upper_bound_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/jitter_upper_bound_experiment_gn/moz.build
 index 6f0e85bc42..32f1ce05c6 100644
 --- third_party/libwebrtc/rtc_base/experiments/jitter_upper_bound_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/jitter_upper_bound_experiment_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -15571,7 +15602,7 @@ index 6f0e85bc42..32f1ce05c6 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -15582,7 +15613,7 @@ index 6f0e85bc42..32f1ce05c6 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -15593,24 +15624,24 @@ index 6f0e85bc42..32f1ce05c6 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
 index d1321d6a34..7eb3cfdc8d 100644
 --- third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -15628,7 +15659,7 @@ index d1321d6a34..7eb3cfdc8d 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -15639,7 +15670,7 @@ index d1321d6a34..7eb3cfdc8d 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -15650,24 +15681,24 @@ index d1321d6a34..7eb3cfdc8d 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
 index 9c23102ce9..dcb4e39f25 100644
 --- third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -15685,7 +15716,7 @@ index 9c23102ce9..dcb4e39f25 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -15696,7 +15727,7 @@ index 9c23102ce9..dcb4e39f25 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -15707,24 +15738,24 @@ index 9c23102ce9..dcb4e39f25 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build
 index d336e658c0..ceb5cf6cbe 100644
 --- third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -15742,7 +15773,7 @@ index d336e658c0..ceb5cf6cbe 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -15753,7 +15784,7 @@ index d336e658c0..ceb5cf6cbe 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -15764,24 +15795,24 @@ index d336e658c0..ceb5cf6cbe 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
 index 9b65e10218..286f122ed6 100644
 --- third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -15799,7 +15830,7 @@ index 9b65e10218..286f122ed6 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -15810,7 +15841,7 @@ index 9b65e10218..286f122ed6 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -15821,24 +15852,24 @@ index 9b65e10218..286f122ed6 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
 index c5b21c9f05..a75e83a45d 100644
 --- third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -15856,7 +15887,7 @@ index c5b21c9f05..a75e83a45d 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -15867,7 +15898,7 @@ index c5b21c9f05..a75e83a45d 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -15878,24 +15909,24 @@ index c5b21c9f05..a75e83a45d 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
 index 0be8b6e56e..063f6ca854 100644
 --- third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -15913,7 +15944,7 @@ index 0be8b6e56e..063f6ca854 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -15924,7 +15955,7 @@ index 0be8b6e56e..063f6ca854 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -15935,24 +15966,24 @@ index 0be8b6e56e..063f6ca854 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build
 index 5edc266617..0b15891971 100644
 --- third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -15970,7 +16001,7 @@ index 5edc266617..0b15891971 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -15981,7 +16012,7 @@ index 5edc266617..0b15891971 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -15992,24 +16023,24 @@ index 5edc266617..0b15891971 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
 index c90ea47893..1e0ae39f5a 100644
 --- third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -16027,7 +16058,7 @@ index c90ea47893..1e0ae39f5a 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -16038,7 +16069,7 @@ index c90ea47893..1e0ae39f5a 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -16049,19 +16080,19 @@ index c90ea47893..1e0ae39f5a 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
 index 83bd305dbd..397c03437b 100644
 --- third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
@@ -16154,7 +16185,7 @@ diff --git third_party/libwebrtc/rtc_base/logging_gn/moz.build third_party/libwe
 index 3cd69d3494..816cbc3dba 100644
 --- third_party/libwebrtc/rtc_base/logging_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/logging_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -16172,7 +16203,7 @@ index 3cd69d3494..816cbc3dba 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -16183,7 +16214,7 @@ index 3cd69d3494..816cbc3dba 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -16194,19 +16225,19 @@ index 3cd69d3494..816cbc3dba 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/macromagic_gn/moz.build third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
 index bf9b26b06d..f400c123d1 100644
 --- third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
@@ -16255,7 +16286,7 @@ diff --git third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build thi
 index 8eb7cbafda..7270026522 100644
 --- third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -16273,7 +16304,7 @@ index 8eb7cbafda..7270026522 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -16284,7 +16315,7 @@ index 8eb7cbafda..7270026522 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -16295,24 +16326,24 @@ index 8eb7cbafda..7270026522 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
 index 175efb565e..01002b6f68 100644
 --- third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
-@@ -63,6 +63,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -63,6 +63,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -16330,7 +16361,7 @@ index 175efb565e..01002b6f68 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -145,6 +156,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -145,6 +156,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -16341,7 +16372,7 @@ index 175efb565e..01002b6f68 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -161,6 +176,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +176,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -16352,24 +16383,24 @@ index 175efb565e..01002b6f68 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -183,6 +202,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -185,6 +204,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
 index 27d304aa8a..4e0da258de 100644
 --- third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -16387,7 +16418,7 @@ index 27d304aa8a..4e0da258de 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -16398,7 +16429,7 @@ index 27d304aa8a..4e0da258de 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -16409,24 +16440,24 @@ index 27d304aa8a..4e0da258de 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
 index b8919fe70d..92c62a2dc5 100644
 --- third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
-@@ -63,6 +63,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -63,6 +63,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -16444,7 +16475,7 @@ index b8919fe70d..92c62a2dc5 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -145,6 +156,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -145,6 +156,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -16455,7 +16486,7 @@ index b8919fe70d..92c62a2dc5 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -161,6 +176,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +176,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -16466,19 +16497,19 @@ index b8919fe70d..92c62a2dc5 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -183,6 +202,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -185,6 +204,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
 index 29bb85689a..51a5a79011 100644
 --- third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
@@ -16527,7 +16558,7 @@ diff --git third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build third_party/
 index 4b43624a4d..8f90e5fc32 100644
 --- third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -16545,7 +16576,7 @@ index 4b43624a4d..8f90e5fc32 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -160,6 +171,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -160,6 +171,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -16556,7 +16587,7 @@ index 4b43624a4d..8f90e5fc32 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -176,6 +191,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -176,6 +191,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -16567,19 +16598,19 @@ index 4b43624a4d..8f90e5fc32 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -198,6 +217,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -200,6 +219,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/refcount_gn/moz.build third_party/libwebrtc/rtc_base/refcount_gn/moz.build
 index 0bb1831752..e1e97a1c61 100644
 --- third_party/libwebrtc/rtc_base/refcount_gn/moz.build
@@ -16628,7 +16659,7 @@ diff --git third_party/libwebrtc/rtc_base/rtc_base_approved_gn/moz.build third_p
 index 1a0a056251..681b7f6e3e 100644
 --- third_party/libwebrtc/rtc_base/rtc_base_approved_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rtc_base_approved_gn/moz.build
-@@ -80,6 +80,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -80,6 +80,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -16646,7 +16677,7 @@ index 1a0a056251..681b7f6e3e 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -170,6 +181,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -170,6 +181,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -16657,7 +16688,7 @@ index 1a0a056251..681b7f6e3e 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -186,6 +201,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -186,6 +201,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -16668,24 +16699,24 @@ index 1a0a056251..681b7f6e3e 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -208,6 +227,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -210,6 +229,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build
 index 2831f73c90..208fc12f5a 100644
 --- third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build
-@@ -94,6 +94,21 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -94,6 +94,21 @@
          "/third_party/libwebrtc/rtc_base/mac_ifaddrs_converter.cc"
      ]
  
@@ -16707,7 +16738,7 @@ index 2831f73c90..208fc12f5a 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -203,6 +218,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -203,6 +218,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -16718,7 +16749,7 @@ index 2831f73c90..208fc12f5a 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -219,6 +238,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -219,6 +238,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -16729,24 +16760,24 @@ index 2831f73c90..208fc12f5a 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -241,6 +264,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -243,6 +266,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
 index 76376fd45d..a299d4f539 100644
 --- third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -16764,7 +16795,7 @@ index 76376fd45d..a299d4f539 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -16775,7 +16806,7 @@ index 76376fd45d..a299d4f539 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -16786,24 +16817,24 @@ index 76376fd45d..a299d4f539 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
 index 4a6ac162af..9e1f79a96a 100644
 --- third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
-@@ -69,6 +69,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -69,6 +69,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -16821,7 +16852,7 @@ index 4a6ac162af..9e1f79a96a 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -155,6 +166,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -155,6 +166,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -16832,7 +16863,7 @@ index 4a6ac162af..9e1f79a96a 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -171,6 +186,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -171,6 +186,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -16843,24 +16874,24 @@ index 4a6ac162af..9e1f79a96a 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -193,6 +212,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -195,6 +214,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build
 index 16c3631473..a03e2565fe 100644
 --- third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -16878,7 +16909,7 @@ index 16c3631473..a03e2565fe 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -16889,7 +16920,7 @@ index 16c3631473..a03e2565fe 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -16900,19 +16931,19 @@ index 16c3631473..a03e2565fe 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
 index e4bad4fb28..7654bf0046 100644
 --- third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
@@ -17093,7 +17124,7 @@ diff --git third_party/libwebrtc/rtc_base/stringutils_gn/moz.build third_party/l
 index e398bb8abc..709e325bd2 100644
 --- third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
-@@ -71,6 +71,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -71,6 +71,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -17111,7 +17142,7 @@ index e398bb8abc..709e325bd2 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -17122,7 +17153,7 @@ index e398bb8abc..709e325bd2 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -17133,24 +17164,24 @@ index e398bb8abc..709e325bd2 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
 index 184fcdaa67..ca2360f09e 100644
 --- third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -17168,7 +17199,7 @@ index 184fcdaa67..ca2360f09e 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -17179,7 +17210,7 @@ index 184fcdaa67..ca2360f09e 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -17190,24 +17221,24 @@ index 184fcdaa67..ca2360f09e 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/synchronization/rw_lock_wrapper_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/rw_lock_wrapper_gn/moz.build
 index 5f14995c08..c88bc65d9a 100644
 --- third_party/libwebrtc/rtc_base/synchronization/rw_lock_wrapper_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/synchronization/rw_lock_wrapper_gn/moz.build
-@@ -71,6 +71,21 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -71,6 +71,21 @@
          "/third_party/libwebrtc/rtc_base/synchronization/rw_lock_posix.cc"
      ]
  
@@ -17229,7 +17260,7 @@ index 5f14995c08..c88bc65d9a 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -169,6 +184,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -17240,7 +17271,7 @@ index 5f14995c08..c88bc65d9a 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -185,6 +204,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -185,6 +204,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -17251,24 +17282,24 @@ index 5f14995c08..c88bc65d9a 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -207,6 +230,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -209,6 +232,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/synchronization/sequence_checker_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/sequence_checker_gn/moz.build
 index 5ec0cff625..5d5103a811 100644
 --- third_party/libwebrtc/rtc_base/synchronization/sequence_checker_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/synchronization/sequence_checker_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -17286,7 +17317,7 @@ index 5ec0cff625..5d5103a811 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -17297,7 +17328,7 @@ index 5ec0cff625..5d5103a811 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -17308,24 +17339,24 @@ index 5ec0cff625..5d5103a811 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
 index 1ca980e259..a2f7bfb8e2 100644
 --- third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
-@@ -63,6 +63,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -63,6 +63,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -17343,7 +17374,7 @@ index 1ca980e259..a2f7bfb8e2 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -145,6 +156,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -145,6 +156,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -17354,7 +17385,7 @@ index 1ca980e259..a2f7bfb8e2 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -161,6 +176,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +176,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -17365,24 +17396,24 @@ index 1ca980e259..a2f7bfb8e2 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -183,6 +202,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -185,6 +204,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
 index 5939126563..3d272a6f47 100644
 --- third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -17400,7 +17431,7 @@ index 5939126563..3d272a6f47 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -17411,7 +17442,7 @@ index 5939126563..3d272a6f47 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -17422,19 +17453,19 @@ index 5939126563..3d272a6f47 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/system/arch_gn/moz.build third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
 index a6e7dec918..51b7a68162 100644
 --- third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
@@ -17483,7 +17514,7 @@ diff --git third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build third
 index bc4d7e2469..e6036253b3 100644
 --- third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -17501,7 +17532,7 @@ index bc4d7e2469..e6036253b3 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -17512,7 +17543,7 @@ index bc4d7e2469..e6036253b3 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -17523,19 +17554,19 @@ index bc4d7e2469..e6036253b3 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
 index 2e4468530c..1498b1c742 100644
 --- third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
@@ -17804,7 +17835,7 @@ diff --git third_party/libwebrtc/rtc_base/task_utils/pending_task_safety_flag_gn
 index 3186044467..f6f80401b4 100644
 --- third_party/libwebrtc/rtc_base/task_utils/pending_task_safety_flag_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/task_utils/pending_task_safety_flag_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -17822,7 +17853,7 @@ index 3186044467..f6f80401b4 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -17833,7 +17864,7 @@ index 3186044467..f6f80401b4 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -17844,24 +17875,24 @@ index 3186044467..f6f80401b4 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
 index 3218f68235..bcb9f2e32e 100644
 --- third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -17879,7 +17910,7 @@ index 3218f68235..bcb9f2e32e 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -160,6 +171,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -160,6 +171,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -17890,7 +17921,7 @@ index 3218f68235..bcb9f2e32e 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -176,6 +191,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -176,6 +191,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -17901,19 +17932,19 @@ index 3218f68235..bcb9f2e32e 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -198,6 +217,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -200,6 +219,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/task_utils/to_queued_task_gn/moz.build third_party/libwebrtc/rtc_base/task_utils/to_queued_task_gn/moz.build
 index f6d95c5d8f..acb9a10fb1 100644
 --- third_party/libwebrtc/rtc_base/task_utils/to_queued_task_gn/moz.build
@@ -17962,7 +17993,7 @@ diff --git third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
 index 0849487bee..5f494b2a1d 100644
 --- third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
-@@ -63,6 +63,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -63,6 +63,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -17980,7 +18011,7 @@ index 0849487bee..5f494b2a1d 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -145,6 +156,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -145,6 +156,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -17991,7 +18022,7 @@ index 0849487bee..5f494b2a1d 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -161,6 +176,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +176,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -18002,24 +18033,24 @@ index 0849487bee..5f494b2a1d 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -183,6 +202,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -185,6 +204,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
 index a3c1b2d092..41d659e69b 100644
 --- third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
-@@ -63,6 +63,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -63,6 +63,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -18037,7 +18068,7 @@ index a3c1b2d092..41d659e69b 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -145,6 +156,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -145,6 +156,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -18048,7 +18079,7 @@ index a3c1b2d092..41d659e69b 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -161,6 +176,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +176,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -18059,19 +18090,19 @@ index a3c1b2d092..41d659e69b 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -183,6 +202,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -185,6 +204,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/thread_checker_gn/moz.build third_party/libwebrtc/rtc_base/thread_checker_gn/moz.build
 index eb1c598134..3b4bd04a61 100644
 --- third_party/libwebrtc/rtc_base/thread_checker_gn/moz.build
@@ -18120,7 +18151,7 @@ diff --git third_party/libwebrtc/rtc_base/time/timestamp_extrapolator_gn/moz.bui
 index 7dd65b9bb4..9ecca631cd 100644
 --- third_party/libwebrtc/rtc_base/time/timestamp_extrapolator_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/time/timestamp_extrapolator_gn/moz.build
-@@ -63,6 +63,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -63,6 +63,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -18138,7 +18169,7 @@ index 7dd65b9bb4..9ecca631cd 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -18149,7 +18180,7 @@ index 7dd65b9bb4..9ecca631cd 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -18160,24 +18191,24 @@ index 7dd65b9bb4..9ecca631cd 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/timeutils_gn/moz.build third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
 index 39632fc6d5..0224cebffc 100644
 --- third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
-@@ -69,6 +69,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -69,6 +69,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -18195,7 +18226,7 @@ index 39632fc6d5..0224cebffc 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -155,6 +166,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -155,6 +166,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -18206,7 +18237,7 @@ index 39632fc6d5..0224cebffc 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -171,6 +186,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -171,6 +186,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -18217,19 +18248,19 @@ index 39632fc6d5..0224cebffc 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -193,6 +212,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -195,6 +214,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/rtc_base/type_traits_gn/moz.build third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
 index 5cff354c04..eec4cdbb8b 100644
 --- third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
@@ -18322,7 +18353,7 @@ diff --git third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build third_party/libw
 index a9a520b2bc..507a1f5c53 100644
 --- third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -18340,7 +18371,7 @@ index a9a520b2bc..507a1f5c53 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -149,6 +160,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -149,6 +160,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -18351,7 +18382,7 @@ index a9a520b2bc..507a1f5c53 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -165,6 +180,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -165,6 +180,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -18362,24 +18393,24 @@ index a9a520b2bc..507a1f5c53 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -187,6 +206,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -189,6 +208,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
 index e8fd3bd45c..69cd370233 100644
 --- third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
 +++ third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -18397,7 +18428,7 @@ index e8fd3bd45c..69cd370233 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -18408,7 +18439,7 @@ index e8fd3bd45c..69cd370233 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -18419,24 +18450,24 @@ index e8fd3bd45c..69cd370233 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/system_wrappers/metrics_gn/moz.build third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
 index 0edfd92501..c3e0662ddc 100644
 --- third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
 +++ third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
-@@ -67,6 +67,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -67,6 +67,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -18454,7 +18485,7 @@ index 0edfd92501..c3e0662ddc 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -153,6 +164,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -18465,7 +18496,7 @@ index 0edfd92501..c3e0662ddc 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +184,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -18476,24 +18507,24 @@ index 0edfd92501..c3e0662ddc 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -191,6 +210,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -193,6 +212,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
 index 727662430e..a1eaab4f3c 100644
 --- third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
 +++ third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
-@@ -77,6 +77,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -77,6 +77,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -18511,7 +18542,7 @@ index 727662430e..a1eaab4f3c 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -174,6 +185,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -174,6 +185,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -18522,7 +18553,7 @@ index 727662430e..a1eaab4f3c 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -190,6 +205,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -190,6 +205,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -18533,24 +18564,24 @@ index 727662430e..a1eaab4f3c 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -212,6 +231,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -214,6 +233,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/test/rtp_test_utils_gn/moz.build third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
 index c222e6a3af..1379660d79 100644
 --- third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
 +++ third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -18568,7 +18599,7 @@ index c222e6a3af..1379660d79 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -162,6 +173,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +173,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -18579,7 +18610,7 @@ index c222e6a3af..1379660d79 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -178,6 +193,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -178,6 +193,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -18590,19 +18621,19 @@ index c222e6a3af..1379660d79 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -200,6 +219,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -202,6 +221,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build
 index 5d029de38b..11db562390 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build
@@ -18781,7 +18812,7 @@ diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_g
 index 0c5b308301..7f08b5e075 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build
-@@ -48,6 +48,13 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -48,6 +48,13 @@
      DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
      DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
  
@@ -18795,7 +18826,7 @@ index 0c5b308301..7f08b5e075 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -113,6 +120,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -113,6 +120,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -18806,24 +18837,24 @@ index 0c5b308301..7f08b5e075 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -135,6 +146,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -137,6 +148,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build
 index 0f5efc71ee..077e2ac488 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build
-@@ -48,6 +48,13 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -48,6 +48,13 @@
      DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
      DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
  
@@ -18837,7 +18868,7 @@ index 0f5efc71ee..077e2ac488 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -113,6 +120,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -113,6 +120,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -18848,19 +18879,19 @@ index 0f5efc71ee..077e2ac488 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -135,6 +146,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -137,6 +148,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build
 index 640a888c66..d295f9af68 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build
@@ -19039,7 +19070,7 @@ diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/m
 index dbc65169f7..82dc91cfd7 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build
-@@ -48,6 +48,13 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -48,6 +48,13 @@
      DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
      DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
  
@@ -19053,7 +19084,7 @@ index dbc65169f7..82dc91cfd7 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -113,6 +120,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -113,6 +120,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -19064,24 +19095,24 @@ index dbc65169f7..82dc91cfd7 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -135,6 +146,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -137,6 +148,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/strings/internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/strings/internal_gn/moz.build
 index 8d3df8b96f..89719dac9b 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/strings/internal_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/strings/internal_gn/moz.build
-@@ -50,6 +50,13 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -50,6 +50,13 @@
      DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
      DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
  
@@ -19095,7 +19126,7 @@ index 8d3df8b96f..89719dac9b 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -115,6 +122,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -115,6 +122,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -19106,24 +19137,24 @@ index 8d3df8b96f..89719dac9b 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -137,6 +148,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -139,6 +150,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build
 index 28fe7987c0..e1cdd13b2a 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build
-@@ -63,6 +63,13 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -63,6 +63,13 @@
      DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
      DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
  
@@ -19137,7 +19168,7 @@ index 28fe7987c0..e1cdd13b2a 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -128,6 +135,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -128,6 +135,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -19148,24 +19179,24 @@ index 28fe7987c0..e1cdd13b2a 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -150,6 +161,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -152,6 +163,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build
 index c7f0ea0054..971bf1ea7f 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build
-@@ -48,6 +48,13 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -48,6 +48,13 @@
      DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
      DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
  
@@ -19179,7 +19210,7 @@ index c7f0ea0054..971bf1ea7f 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -113,6 +120,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -113,6 +120,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -19190,24 +19221,24 @@ index c7f0ea0054..971bf1ea7f 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -135,6 +146,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -137,6 +148,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build
 index 89022d5d84..8a243f7328 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build
-@@ -48,6 +48,13 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -48,6 +48,13 @@
      DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
      DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
  
@@ -19221,7 +19252,7 @@ index 89022d5d84..8a243f7328 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -113,6 +120,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -113,6 +120,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -19232,19 +19263,19 @@ index 89022d5d84..8a243f7328 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -135,6 +146,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -137,6 +148,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build
 index 2579d0b18d..cf62758dee 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build
@@ -19365,7 +19396,7 @@ diff --git third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build third_part
 index fa20ebbc5f..0d6b22cb12 100644
 --- third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
 +++ third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
-@@ -49,6 +49,15 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -49,6 +49,15 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -19381,7 +19412,7 @@ index fa20ebbc5f..0d6b22cb12 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -117,6 +126,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -117,6 +126,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -19392,7 +19423,7 @@ index fa20ebbc5f..0d6b22cb12 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -133,6 +146,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -133,6 +146,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -19403,24 +19434,24 @@ index fa20ebbc5f..0d6b22cb12 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -155,6 +172,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -157,6 +174,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
-+    CFLAGS += [
++    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
 index aef691bff4..bd388e306b 100644
 --- third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
 +++ third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
-@@ -49,6 +49,15 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -49,6 +49,15 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -19436,7 +19467,7 @@ index aef691bff4..bd388e306b 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -116,6 +125,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -116,6 +125,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -19447,7 +19478,7 @@ index aef691bff4..bd388e306b 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -132,6 +145,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -132,6 +145,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -19458,24 +19489,24 @@ index aef691bff4..bd388e306b 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -154,6 +171,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -156,6 +173,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
 index 1490845fcf..00e22b881a 100644
 --- third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
 +++ third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
-@@ -75,6 +75,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -75,6 +75,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -19493,7 +19524,7 @@ index 1490845fcf..00e22b881a 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -169,6 +180,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -169,6 +180,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -19504,7 +19535,7 @@ index 1490845fcf..00e22b881a 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -185,6 +200,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -185,6 +200,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -19515,24 +19546,24 @@ index 1490845fcf..00e22b881a 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -207,6 +226,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -209,6 +228,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
 index 624c83e80d..4c8d88442b 100644
 --- third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
 +++ third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
-@@ -68,6 +68,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -68,6 +68,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -19550,7 +19581,7 @@ index 624c83e80d..4c8d88442b 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -162,6 +173,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -162,6 +173,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -19561,7 +19592,7 @@ index 624c83e80d..4c8d88442b 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -178,6 +193,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -178,6 +193,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -19572,24 +19603,24 @@ index 624c83e80d..4c8d88442b 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -200,6 +219,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -202,6 +221,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/video/video_gn/moz.build third_party/libwebrtc/video/video_gn/moz.build
 index c361d527ed..b37479a9be 100644
 --- third_party/libwebrtc/video/video_gn/moz.build
 +++ third_party/libwebrtc/video/video_gn/moz.build
-@@ -97,6 +97,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -97,6 +97,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -19607,7 +19638,7 @@ index c361d527ed..b37479a9be 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -191,6 +202,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -191,6 +202,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -19618,7 +19649,7 @@ index c361d527ed..b37479a9be 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -207,6 +222,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -207,6 +222,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -19629,24 +19660,24 @@ index c361d527ed..b37479a9be 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -229,6 +248,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -231,6 +250,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
 index 71efcab220..43c68adedd 100644
 --- third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
 +++ third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
-@@ -73,6 +73,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -73,6 +73,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
@@ -19664,7 +19695,7 @@ index 71efcab220..43c68adedd 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -167,6 +178,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -167,6 +178,10 @@
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -19675,7 +19706,7 @@ index 71efcab220..43c68adedd 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -183,6 +198,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -183,6 +198,10 @@
  
      DEFINES["_DEBUG"] = True
  
@@ -19686,19 +19717,19 @@ index 71efcab220..43c68adedd 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -205,6 +224,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-         "android_support"
-     ]
+@@ -207,6 +226,12 @@
  
+     OS_LIBS += [
+         "android_support"
++    ]
++
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-+    ]
-+
- if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+     ]
  
-     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/webrtc_gn/moz.build third_party/libwebrtc/webrtc_gn/moz.build
 index 625bd0b5dd..4dddfea2fd 100644
 --- third_party/libwebrtc/webrtc_gn/moz.build
-- 
cgit v1.2.3