git: 32483d9217aa - 2022Q2 - www/firefox: update to 102.0 (rc1)

From: Christoph Moench-Tegeder <cmt_at_FreeBSD.org>
Date: Wed, 22 Jun 2022 14:33:26 UTC
The branch 2022Q2 has been updated by cmt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=32483d9217aa0a08f9759ff55e281ad0c683480d

commit 32483d9217aa0a08f9759ff55e281ad0c683480d
Author:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2022-06-22 14:27:56 +0000
Commit:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2022-06-22 14:33:12 +0000

    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
*** 12603 LINES SKIPPED ***