git: a0760a804ac1 - 2026Q3 - www/librewolf: Update 154.0.1-3 => 155.0.1-1

From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Mon, 14 Sep 2026 20:41:01 UTC
The branch 2026Q3 has been updated by vvd:

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

commit a0760a804ac1fa09367e140361eebdee696ecb17
Author:     Martin Filla <freebsd@sysctl.cz>
AuthorDate: 2026-09-14 20:38:02 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-09-14 20:40:52 +0000

    www/librewolf: Update 154.0.1-3 => 155.0.1-1
    
    Release Notes:
    https://www.firefox.com/en-US/firefox/155.0.1/releasenotes/
    
    PR:             298478
    Sponsored by:   UNIS Labs (vvd, commit patch)
    MFH:            2026Q3
    
    (cherry picked from commit 17e40b092b4f18b37a8434be80a99d4e4240fdf6)
---
 www/librewolf/Makefile                             |     6 +-
 www/librewolf/distinfo                             |     6 +-
 .../patch-build_moz.configure_toolchain.configure  |    17 +-
 www/librewolf/files/patch-enable-webserial         |    73 +
 www/librewolf/files/patch-libwebrtc-generated      | 14806 ++++++++++---------
 ...rd__party_libwebrtc_build_config_BUILDCONFIG.gn |    92 +-
 ...__party_pipewire_spa_param_audio_layout-types.h |    29 +
 ...h-toolkit_components_remote_nsXRemoteServer.cpp |    11 -
 8 files changed, 8175 insertions(+), 6865 deletions(-)

diff --git a/www/librewolf/Makefile b/www/librewolf/Makefile
index e44ab5ad6b13..83e4ccf1a2d1 100644
--- a/www/librewolf/Makefile
+++ b/www/librewolf/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	librewolf
-DISTVERSION=	154.0.1
-LWPATCH=	-3
+DISTVERSION=	155.0.1
+LWPATCH=	-1
 DISTVERSIONSUFFIX=	${LWPATCH}.source
 CATEGORIES=	www wayland
 MASTER_SITES=	https://librewolf.dev/api/packages/librewolf/generic/librewolf-source/${DISTVERSION}${LWPATCH}/
@@ -13,7 +13,7 @@ LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
-		nss>=3.126.1:security/nss \
+		nss>=3.128:security/nss \
 		icu>=76.1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=10.1.0:print/harfbuzz \
diff --git a/www/librewolf/distinfo b/www/librewolf/distinfo
index cdd3c5aed94b..e0633fc00911 100644
--- a/www/librewolf/distinfo
+++ b/www/librewolf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1787943682
-SHA256 (librewolf-154.0.1-3.source.tar.gz) = fee6caac30f9aff6dfd8fe868ce843602b03c3072609c86ff7fc6c17c397a6cc
-SIZE (librewolf-154.0.1-3.source.tar.gz) = 1175015645
+TIMESTAMP = 1789368918
+SHA256 (librewolf-155.0.1-1.source.tar.gz) = 824b084991313f6a980ff64d7af14fd67357fd3f15a7ad338d0cca87c5133208
+SIZE (librewolf-155.0.1-1.source.tar.gz) = 1176022855
diff --git a/www/librewolf/files/patch-build_moz.configure_toolchain.configure b/www/librewolf/files/patch-build_moz.configure_toolchain.configure
index c71acbccc37b..503e5392f4ec 100644
--- a/www/librewolf/files/patch-build_moz.configure_toolchain.configure
+++ b/www/librewolf/files/patch-build_moz.configure_toolchain.configure
@@ -1,4 +1,4 @@
-commit 7503d73295e6a6fd84c35ffabce08e3d2f3b56de
+commit 1c7271a2ab154784620a34030df1fe49fd1fd917
 Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
 
     catch wasm32-wasi target naming in FreeBSD
@@ -9,18 +9,18 @@ Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
     the compiler can find it's assorted files.
 
 diff --git build/moz.configure/toolchain.configure build/moz.configure/toolchain.configure
-index 5ca00b2b62a1..0e66441d8692 100644
+index eb1251f51ff3..d327dba3760d 100644
 --- build/moz.configure/toolchain.configure
 +++ build/moz.configure/toolchain.configure
-@@ -653,6 +653,7 @@ def same_arch_different_bits():
+@@ -655,6 +655,7 @@ def same_arch_different_bits():
  
  @imports(_from="mozshellutil", _import="quote")
  @imports(_from="mozbuild.configure.constants", _import="OS_preprocessor_checks")
 +@imports(_from="sys", _import="platform")
- def check_compiler(configure_cache, compiler, language, target, android_version):
-     info = get_compiler_info(configure_cache, compiler, language)
- 
-@@ -695,8 +696,9 @@ def check_compiler(configure_cache, compiler, language, target, android_version)
+ def check_compiler(
+     configure_cache, compiler, language, target, android_version, wrapper=[]
+ ):
+@@ -699,8 +700,9 @@ def check_compiler(
          # This makes clang define __ANDROID_API__ and use versioned library
          # directories from the NDK.
          toolchain = "%s%d" % (target.toolchain, android_version)
@@ -32,14 +32,13 @@ index 5ca00b2b62a1..0e66441d8692 100644
          toolchain = "wasm32-wasip1"
      else:
          toolchain = target.toolchain
-@@ -954,8 +956,10 @@ def compiler_wrapper(wrapper, ccache):
+@@ -1034,8 +1036,9 @@ set_config("CC_KNOWN_WRAPPER_CUSTOM", cc_known_wrapper_custom)
  
  
  @dependable
 +@imports(_from="sys", _import="platform")
  def wasm():
 -    return split_triplet("wasm32-wasi", allow_wasi=True)
-+    log.warning("USING PLATFORM %s" % platform)
 +    return split_triplet("wasm32-wasip1" if platform.startswith("freebsd") else "wasm32-wasi", allow_wasi=True)
  
  
diff --git a/www/librewolf/files/patch-enable-webserial b/www/librewolf/files/patch-enable-webserial
new file mode 100644
index 000000000000..0cf56eb54264
--- /dev/null
+++ b/www/librewolf/files/patch-enable-webserial
@@ -0,0 +1,73 @@
+commit 98cea4a7ca336b4a509cd1e7bcfe69836a9d1f29
+Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
+
+    Enable WebSerial for FreeBSD
+    
+    https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=297874
+    
+    Patch by pcc <pcc@gmx.net>
+
+diff --git dom/webserial/PosixSerialPlatformService.cpp dom/webserial/PosixSerialPlatformService.cpp
+index 9389ef0d9821..0786bf5f0dd5 100644
+--- dom/webserial/PosixSerialPlatformService.cpp
++++ dom/webserial/PosixSerialPlatformService.cpp
+@@ -419,6 +419,32 @@ nsresult PosixSerialPlatformService::EnumeratePortsImpl(
+     *aLikelyAccessDenied =
+         aPorts.IsEmpty() && (errors == ErrorKind::eAccessDenied);
+   }
++#elif defined(XP_FREEBSD)
++  DIR* devDir = opendir("/dev");
++  if (devDir) {
++    auto cleanupDir = MakeScopeExit([&]() { closedir(devDir); });
++    while (struct dirent* ent = readdir(devDir)) {
++      const char* name = ent->d_name;
++      bool isTtyU = strncmp(name, "ttyU", 4) == 0;
++      bool isTtyu = strncmp(name, "ttyu", 4) == 0;
++      if ((!isTtyU && !isTtyu) || name[4] < '0' || name[4] > '9') {
++        continue;
++      }
++      nsAutoCString devpath("/dev/");
++      devpath.Append(name);
++      auto isReal = IsRealSerialPort(devpath.get());
++      if (isReal.isErr()) {
++        continue;
++      }
++      NS_ConvertUTF8toUTF16 path(devpath);
++      IPCSerialPortInfo info;
++      info.id() = path;
++      info.path() = path;
++      info.friendlyName() =
++          NS_ConvertUTF8toUTF16(nsDependentCString(name));
++      aPorts.AppendElement(info);
++    }
++  }
+ #endif
+ 
+   MOZ_LOG(gWebSerialLog, LogLevel::Debug,
+diff --git dom/webserial/SerialPlatformService.cpp dom/webserial/SerialPlatformService.cpp
+index 1da19f340514..a7ce888f6d78 100644
+--- dom/webserial/SerialPlatformService.cpp
++++ dom/webserial/SerialPlatformService.cpp
+@@ -15,7 +15,8 @@
+ namespace mozilla::dom {
+ 
+ #if !defined(XP_WIN) && !defined(XP_MACOSX) && \
+-    !(defined(XP_LINUX) && !defined(ANDROID))
++    !(defined(XP_LINUX) && !defined(ANDROID)) && \
++    !defined(XP_FREEBSD)
+ already_AddRefed<SerialPlatformService>
+ SerialPlatformService::GetInstanceImpl() {
+   return MakeAndAddRef<TestSerialPlatformService>();
+diff --git dom/webserial/moz.build dom/webserial/moz.build
+index bc17c7301d7d..77e4ed2f34ea 100644
+--- dom/webserial/moz.build
++++ dom/webserial/moz.build
+@@ -25,7 +25,7 @@ if CONFIG["OS_TARGET"] == "WINNT":
+         "cfgmgr32",
+         "setupapi",
+     ]
+-elif (CONFIG["OS_TARGET"] == "Darwin" and CONFIG["TARGET_OS"] != "iOS") or CONFIG[
++elif (CONFIG["OS_TARGET"] == "Darwin" and CONFIG["TARGET_OS"] != "iOS") or CONFIG["OS_TARGET"] == "FreeBSD" or CONFIG[
+     "OS_TARGET"
+ ] == "Linux":
+     UNIFIED_SOURCES += [
diff --git a/www/librewolf/files/patch-libwebrtc-generated b/www/librewolf/files/patch-libwebrtc-generated
index 3fb6a095d87a..7aa36b54b2a3 100644
--- a/www/librewolf/files/patch-libwebrtc-generated
+++ b/www/librewolf/files/patch-libwebrtc-generated
@@ -1,7 +1,7 @@
-commit 498955fd2a30ded11bc7f8645ff40160ba0db492
+commit 3adc3650826f2f039f9dcc9bbcd7f51c2abb10f1
 Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
 
-    regenerate FreeBSD libwebrtc patch for gecko 154
+    regenerate FreeBSD libwebrtc patch for gecko 155
 
 diff --git third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
 index 2060d5597a7c..643ec6ab666e 100644
@@ -7903,10 +7903,10 @@ index 70aaae2e960f..6508431472e4 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
  Library("environment_gn")
-diff --git third_party/libwebrtc/api/fec_controller_api_gn/moz.build third_party/libwebrtc/api/fec_controller_api_gn/moz.build
-index 013d894843ba..346b236d1bba 100644
---- third_party/libwebrtc/api/fec_controller_api_gn/moz.build
-+++ third_party/libwebrtc/api/fec_controller_api_gn/moz.build
+diff --git third_party/libwebrtc/api/environment/force_test_environment_gn/moz.build third_party/libwebrtc/api/environment/force_test_environment_gn/moz.build
+index 70f1c342628e..f16371a26e08 100644
+--- third_party/libwebrtc/api/environment/force_test_environment_gn/moz.build
++++ third_party/libwebrtc/api/environment/force_test_environment_gn/moz.build
 @@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -7930,7 +7930,7 @@ index 013d894843ba..346b236d1bba 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -43,97 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,82 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7949,10 +7949,6 @@ index 013d894843ba..346b236d1bba 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "log"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_MAC"] = True
@@ -7960,10 +7956,6 @@ index 013d894843ba..346b236d1bba 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "-framework Foundation"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Linux":
 -
 -    DEFINES["USE_AURA"] = "1"
@@ -8018,23 +8010,20 @@ index 013d894843ba..346b236d1bba 100644
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
 -    DEFINES["__STD_C"] = True
--
--    OS_LIBS += [
--        "crypt32",
--        "iphlpapi",
--        "secur32",
--        "winmm"
--    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
 -if CONFIG["TARGET_CPU"] == "arm":
 -
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -8055,10 +8044,12 @@ index 013d894843ba..346b236d1bba 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -169,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
- 
-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 -
 -    DEFINES["_DEBUG"] = True
@@ -8079,6 +8070,12 @@ index 013d894843ba..346b236d1bba 100644
 -
 -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 -
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
+-
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -8089,17 +8086,24 @@ index 013d894843ba..346b236d1bba 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -    DEFINES["_GNU_SOURCE"] = True
--
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
--
++if CONFIG["TARGET_CPU"] == "x86_64":
+ 
 -    DEFINES["_GNU_SOURCE"] = True
--
- Library("fec_controller_api_gn")
-diff --git third_party/libwebrtc/api/field_trials_registry_gn/moz.build third_party/libwebrtc/api/field_trials_registry_gn/moz.build
-index 278f59afacc9..36ab4bca6297 100644
---- third_party/libwebrtc/api/field_trials_registry_gn/moz.build
-+++ third_party/libwebrtc/api/field_trials_registry_gn/moz.build
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+ Library("force_test_environment_gn")
+diff --git third_party/libwebrtc/api/fec_controller_api_gn/moz.build third_party/libwebrtc/api/fec_controller_api_gn/moz.build
+index 013d894843ba..346b236d1bba 100644
+--- third_party/libwebrtc/api/fec_controller_api_gn/moz.build
++++ third_party/libwebrtc/api/fec_controller_api_gn/moz.build
 @@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -8123,7 +8127,7 @@ index 278f59afacc9..36ab4bca6297 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,97 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,97 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8222,16 +8226,12 @@ index 278f59afacc9..36ab4bca6297 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -145,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
 -if CONFIG["TARGET_CPU"] == "arm":
 -
--    CXXFLAGS += [
--        "-mfpu=neon"
--    ]
--
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -8252,12 +8252,10 @@ index 278f59afacc9..36ab4bca6297 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
--
--if CONFIG["TARGET_CPU"] == "x86_64":
--
--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
--
+@@ -169,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+ 
+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 -
 -    DEFINES["_DEBUG"] = True
@@ -8278,12 +8276,6 @@ index 278f59afacc9..36ab4bca6297 100644
 -
 -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 -
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -8294,24 +8286,17 @@ index 278f59afacc9..36ab4bca6297 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
 -    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
+-
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["TARGET_CPU"] == "x86_64":
- 
+-
 -    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
- Library("field_trials_registry_gn")
-diff --git third_party/libwebrtc/api/field_trials_view_gn/moz.build third_party/libwebrtc/api/field_trials_view_gn/moz.build
-index 02b38330e521..07dd49ed9bb6 100644
---- third_party/libwebrtc/api/field_trials_view_gn/moz.build
-+++ third_party/libwebrtc/api/field_trials_view_gn/moz.build
+-
+ Library("fec_controller_api_gn")
+diff --git third_party/libwebrtc/api/field_trials_registry_gn/moz.build third_party/libwebrtc/api/field_trials_registry_gn/moz.build
+index 278f59afacc9..36ab4bca6297 100644
+--- third_party/libwebrtc/api/field_trials_registry_gn/moz.build
++++ third_party/libwebrtc/api/field_trials_registry_gn/moz.build
 @@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -8335,7 +8320,7 @@ index 02b38330e521..07dd49ed9bb6 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,97 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8365,6 +8350,10 @@ index 02b38330e521..07dd49ed9bb6 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
+-    OS_LIBS += [
+-        "-framework Foundation"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Linux":
 -
 -    DEFINES["USE_AURA"] = "1"
@@ -8419,16 +8408,27 @@ index 02b38330e521..07dd49ed9bb6 100644
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
 -    DEFINES["__STD_C"] = True
+-
+-    OS_LIBS += [
+-        "crypt32",
+-        "iphlpapi",
+-        "secur32",
+-        "winmm"
+-    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -145,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
 -if CONFIG["TARGET_CPU"] == "arm":
 -
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -8449,10 +8449,12 @@ index 02b38330e521..07dd49ed9bb6 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
- 
-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 -
 -    DEFINES["_DEBUG"] = True
@@ -8473,6 +8475,12 @@ index 02b38330e521..07dd49ed9bb6 100644
 -
 -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 -
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
+-
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -8483,17 +8491,24 @@ index 02b38330e521..07dd49ed9bb6 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
--    DEFINES["_GNU_SOURCE"] = True
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
 -
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
--
++if CONFIG["TARGET_CPU"] == "x86_64":
+ 
 -    DEFINES["_GNU_SOURCE"] = True
--
- Library("field_trials_view_gn")
-diff --git third_party/libwebrtc/api/frame_transformer_factory_gn/moz.build third_party/libwebrtc/api/frame_transformer_factory_gn/moz.build
-index 0b6843ff9cb5..edf25d2bb3f8 100644
---- third_party/libwebrtc/api/frame_transformer_factory_gn/moz.build
-+++ third_party/libwebrtc/api/frame_transformer_factory_gn/moz.build
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+ Library("field_trials_registry_gn")
+diff --git third_party/libwebrtc/api/field_trials_view_gn/moz.build third_party/libwebrtc/api/field_trials_view_gn/moz.build
+index 02b38330e521..07dd49ed9bb6 100644
+--- third_party/libwebrtc/api/field_trials_view_gn/moz.build
++++ third_party/libwebrtc/api/field_trials_view_gn/moz.build
 @@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -8517,7 +8532,7 @@ index 0b6843ff9cb5..edf25d2bb3f8 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,98 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8537,7 +8552,6 @@ index 0b6843ff9cb5..edf25d2bb3f8 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -8548,10 +8562,6 @@ index 0b6843ff9cb5..edf25d2bb3f8 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "-framework Foundation"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Linux":
 -
 -    DEFINES["USE_AURA"] = "1"
@@ -8606,27 +8616,16 @@ index 0b6843ff9cb5..edf25d2bb3f8 100644
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
 -    DEFINES["__STD_C"] = True
--
--    OS_LIBS += [
--        "crypt32",
--        "iphlpapi",
--        "secur32",
--        "winmm"
--    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -146,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
 -if CONFIG["TARGET_CPU"] == "arm":
 -
--    CXXFLAGS += [
--        "-mfpu=neon"
--    ]
--
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -8647,12 +8646,10 @@ index 0b6843ff9cb5..edf25d2bb3f8 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
--
--if CONFIG["TARGET_CPU"] == "x86_64":
--
--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
--
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+ 
+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 -
 -    DEFINES["_DEBUG"] = True
@@ -8673,12 +8670,6 @@ index 0b6843ff9cb5..edf25d2bb3f8 100644
 -
 -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 -
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -8689,24 +8680,17 @@ index 0b6843ff9cb5..edf25d2bb3f8 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
 -    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
+-
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["TARGET_CPU"] == "x86_64":
- 
+-
 -    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
- Library("frame_transformer_factory_gn")
-diff --git third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
-index d6eb140e5cc5..228d8df3fe02 100644
---- third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
-+++ third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
+-
+ Library("field_trials_view_gn")
+diff --git third_party/libwebrtc/api/frame_transformer_factory_gn/moz.build third_party/libwebrtc/api/frame_transformer_factory_gn/moz.build
+index 0b6843ff9cb5..edf25d2bb3f8 100644
+--- third_party/libwebrtc/api/frame_transformer_factory_gn/moz.build
++++ third_party/libwebrtc/api/frame_transformer_factory_gn/moz.build
 @@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -8730,7 +8714,7 @@ index d6eb140e5cc5..228d8df3fe02 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,97 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,98 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8750,6 +8734,7 @@ index d6eb140e5cc5..228d8df3fe02 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
+-        "GLESv2",
 -        "log"
 -    ]
 -
@@ -8829,7 +8814,7 @@ index d6eb140e5cc5..228d8df3fe02 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -145,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -146,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -8914,11 +8899,11 @@ index d6eb140e5cc5..228d8df3fe02 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("frame_transformer_interface_gn")
-diff --git third_party/libwebrtc/api/function_view_gn/moz.build third_party/libwebrtc/api/function_view_gn/moz.build
-index b5c55b973d29..1bfaae50c76f 100644
---- third_party/libwebrtc/api/function_view_gn/moz.build
-+++ third_party/libwebrtc/api/function_view_gn/moz.build
+ Library("frame_transformer_factory_gn")
+diff --git third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
+index d6eb140e5cc5..228d8df3fe02 100644
+--- third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
++++ third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
 @@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -8942,7 +8927,7 @@ index b5c55b973d29..1bfaae50c76f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,97 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8972,6 +8957,10 @@ index b5c55b973d29..1bfaae50c76f 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
+-    OS_LIBS += [
+-        "-framework Foundation"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Linux":
 -
 -    DEFINES["USE_AURA"] = "1"
@@ -9026,16 +9015,27 @@ index b5c55b973d29..1bfaae50c76f 100644
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
 -    DEFINES["__STD_C"] = True
+-
+-    OS_LIBS += [
+-        "crypt32",
+-        "iphlpapi",
+-        "secur32",
+-        "winmm"
+-    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -145,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
 -if CONFIG["TARGET_CPU"] == "arm":
 -
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -9056,10 +9056,12 @@ index b5c55b973d29..1bfaae50c76f 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
- 
-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 -
 -    DEFINES["_DEBUG"] = True
@@ -9080,6 +9082,12 @@ index b5c55b973d29..1bfaae50c76f 100644
 -
 -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 -
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
+-
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -9090,17 +9098,24 @@ index b5c55b973d29..1bfaae50c76f 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
--    DEFINES["_GNU_SOURCE"] = True
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
 -
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
--
++if CONFIG["TARGET_CPU"] == "x86_64":
+ 
 -    DEFINES["_GNU_SOURCE"] = True
--
- Library("function_view_gn")
-diff --git third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
-index dd4494c2e533..49d182e68be6 100644
---- third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
-+++ third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+ Library("frame_transformer_interface_gn")
+diff --git third_party/libwebrtc/api/function_view_gn/moz.build third_party/libwebrtc/api/function_view_gn/moz.build
+index b5c55b973d29..1bfaae50c76f 100644
+--- third_party/libwebrtc/api/function_view_gn/moz.build
++++ third_party/libwebrtc/api/function_view_gn/moz.build
 @@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -9124,7 +9139,7 @@ index dd4494c2e533..49d182e68be6 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9143,6 +9158,10 @@ index dd4494c2e533..49d182e68be6 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
+-    OS_LIBS += [
+-        "log"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_MAC"] = True
@@ -9208,7 +9227,7 @@ index dd4494c2e533..49d182e68be6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -9234,7 +9253,7 @@ index dd4494c2e533..49d182e68be6 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -9274,11 +9293,11 @@ index dd4494c2e533..49d182e68be6 100644
 -
 -    DEFINES["_GNU_SOURCE"] = True
 -
- Library("jingle_logging_api_gn")
-diff --git third_party/libwebrtc/api/location_gn/moz.build third_party/libwebrtc/api/location_gn/moz.build
-index 5b2d7a8ee436..139137d0a292 100644
---- third_party/libwebrtc/api/location_gn/moz.build
-+++ third_party/libwebrtc/api/location_gn/moz.build
+ Library("function_view_gn")
+diff --git third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
+index dd4494c2e533..49d182e68be6 100644
+--- third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
++++ third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
 @@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -9452,11 +9471,11 @@ index 5b2d7a8ee436..139137d0a292 100644
 -
 -    DEFINES["_GNU_SOURCE"] = True
 -
- Library("location_gn")
-diff --git third_party/libwebrtc/api/make_ref_counted_gn/moz.build third_party/libwebrtc/api/make_ref_counted_gn/moz.build
-index 89d4c0884105..dbed6cd91d1f 100644
---- third_party/libwebrtc/api/make_ref_counted_gn/moz.build
-+++ third_party/libwebrtc/api/make_ref_counted_gn/moz.build
+ Library("jingle_logging_api_gn")
+diff --git third_party/libwebrtc/api/location_gn/moz.build third_party/libwebrtc/api/location_gn/moz.build
+index 5b2d7a8ee436..139137d0a292 100644
+--- third_party/libwebrtc/api/location_gn/moz.build
++++ third_party/libwebrtc/api/location_gn/moz.build
 @@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -9480,7 +9499,7 @@ index 89d4c0884105..dbed6cd91d1f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9499,10 +9518,6 @@ index 89d4c0884105..dbed6cd91d1f 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "log"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_MAC"] = True
@@ -9568,7 +9583,7 @@ index 89d4c0884105..dbed6cd91d1f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -9594,7 +9609,7 @@ index 89d4c0884105..dbed6cd91d1f 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -9634,11 +9649,11 @@ index 89d4c0884105..dbed6cd91d1f 100644
 -
 -    DEFINES["_GNU_SOURCE"] = True
 -
- Library("make_ref_counted_gn")
-diff --git third_party/libwebrtc/api/media_stream_interface_gn/moz.build third_party/libwebrtc/api/media_stream_interface_gn/moz.build
-index fc467b3bb630..a58fec2d4900 100644
---- third_party/libwebrtc/api/media_stream_interface_gn/moz.build
-+++ third_party/libwebrtc/api/media_stream_interface_gn/moz.build
+ Library("location_gn")
+diff --git third_party/libwebrtc/api/make_ref_counted_gn/moz.build third_party/libwebrtc/api/make_ref_counted_gn/moz.build
+index 89d4c0884105..dbed6cd91d1f 100644
+--- third_party/libwebrtc/api/make_ref_counted_gn/moz.build
++++ third_party/libwebrtc/api/make_ref_counted_gn/moz.build
 @@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -9662,7 +9677,7 @@ index fc467b3bb630..a58fec2d4900 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,97 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9692,10 +9707,6 @@ index fc467b3bb630..a58fec2d4900 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "-framework Foundation"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Linux":
 -
 -    DEFINES["USE_AURA"] = "1"
@@ -9750,27 +9761,16 @@ index fc467b3bb630..a58fec2d4900 100644
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
 -    DEFINES["__STD_C"] = True
--
--    OS_LIBS += [
--        "crypt32",
--        "iphlpapi",
--        "secur32",
--        "winmm"
--    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -145,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
*** 23373 LINES SKIPPED ***